Fixed use of package_path key in pkginfo.

git-svn-id: http://munki.googlecode.com/svn/trunk@370 a4e17f2e-e282-11dd-95e1-755cbddbdd66
This commit is contained in:
Greg Neagle
2009-11-19 03:20:07 +00:00
parent 612a1025b1
commit 9bc637d706
+2 -2
View File
@@ -320,14 +320,14 @@ def installWithInfo(dirpath, installlist):
return restartflag
needtorestart = False
if item.get('package_path','').endswith('.pkg') or \
item.get('package_path','').endswith('.mpkg'):
item.get('package_path','').endswith('.mpkg'):
# admin has specified the relative path of the pkg
# on the DMG
# this is useful if there is more than one pkg on
# the DMG, or the actual pkg is not at the root
# of the DMG
fullpkgpath = os.path.join(mountpoints[0],
item['pkg_path'])
item['package_path'])
if os.path.exists(fullpkgpath):
(retcode, needtorestart) = install(fullpkgpath,
choicesXMLfile)