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

Smarter handling of malformed Info.plists in packages. Instead of throwing an exception, return pkginfo describing the problem.

Browse Source 
git-svn-id: http://munki.googlecode.com/svn/trunk@243 a4e17f2e-e282-11dd-95e1-755cbddbdd66
This commit is contained in:
Greg Neagle
2009-10-02 22:00:17 +00:00
parent 33e0d69436
commit 9bcc50a325
1 changed files with 17 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/client/munkilib/munkicommon.py
+17 -13
View File
@@ -508,22 +508,26 @@ def getOnePackageInfo(pkgpath):
plistpath = os.path.join(pkgpath, "Contents", "Info.plist")
if os.path.exists(plistpath):
pkginfo['filename'] = os.path.basename(pkgpath)
pl = FoundationPlist.readPlist(plistpath)
if "CFBundleIdentifier" in pl:
pkginfo['packageid'] = pl["CFBundleIdentifier"]
elif "Bundle identifier" in pl:
# special case for JAMF Composer generated packages. WTF?
pkginfo['packageid'] = pl["Bundle identifier"]
else:
pkginfo['packageid'] = os.path.basename(pkgpath)
try:
pl = FoundationPlist.readPlist(plistpath)
if "CFBundleIdentifier" in pl:
pkginfo['packageid'] = pl["CFBundleIdentifier"]
elif "Bundle identifier" in pl:
# special case for JAMF Composer generated packages. WTF?
pkginfo['packageid'] = pl["Bundle identifier"]
else:
pkginfo['packageid'] = os.path.basename(pkgpath)
if "CFBundleName" in pl:
pkginfo['name'] = pl["CFBundleName"]
if "CFBundleName" in pl:
pkginfo['name'] = pl["CFBundleName"]
if "IFPkgFlagInstalledSize" in pl:
pkginfo['installed_size'] = pl["IFPkgFlagInstalledSize"]
if "IFPkgFlagInstalledSize" in pl:
pkginfo['installed_size'] = pl["IFPkgFlagInstalledSize"]
pkginfo['version'] = getExtendedVersion(pkgpath)
pkginfo['version'] = getExtendedVersion(pkgpath)
except:
pkginfo['packageid'] = "BAD PLIST in %s" % os.path.basename(pkgpath)
pkginfo['version'] = "0.0.0.0.0"
return pkginfo