mirror/munki
1
0
Fork 0
mirror of https://github.com/munki/munki.git synced 2026-04-23 13:29:26 -05:00
Code Issues Packages Projects Releases Wiki Activity

Replaced (old) use of 'pkgname' a few places with (new) options.pkgname.

Browse Source 
git-svn-id: http://munki.googlecode.com/svn/trunk@619 a4e17f2e-e282-11dd-95e1-755cbddbdd66
This commit is contained in:
Greg Neagle
2010-07-29 14:20:03 +00:00
parent 7b03fdf353
commit de4d656bca
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/client/makepkginfo
+4 -4
View File
@@ -86,11 +86,11 @@ def getCatalogInfoFromDmg(dmgpath, options):
exit(-1)
if options.pkgname:
pkgpath = os.path.join(mountpoints[0], pkgname)
pkgpath = os.path.join(mountpoints[0], options.pkgname)
if os.path.exists(pkgpath):
cataloginfo = munkicommon.getPackageMetaData(pkgpath)
if cataloginfo:
cataloginfo['package_path'] = pkgname
cataloginfo['package_path'] = options.pkgname
elif not options.item:
# search for first package at root
for fsitem in os.listdir(mountpoints[0]):
@@ -108,9 +108,9 @@ def getCatalogInfoFromDmg(dmgpath, options):
if pkgid.startswith("com.adobe.Enterprise.install"):
# we have an Adobe CS5 install package, process
# as Adobe install
pkgname = cataloginfo['receipts'][0].get('filename')
adobepkgname = cataloginfo['receipts'][0].get('filename')
cataloginfo = adobeutils.getAdobeCatalogInfo(
mountpoints[0], pkgname)
mountpoints[0], adobepkgname)
else:
# maybe an Adobe installer/updater/patcher?