mirror/munki
1
0
Fork 0
mirror of https://github.com/munki/munki.git synced 2026-05-01 09:49:31 -05:00
Code Issues Packages Projects Releases Wiki Activity

Code cleanup; removing more commented-out code...

Browse Source 
git-svn-id: http://munki.googlecode.com/svn/trunk@219 a4e17f2e-e282-11dd-95e1-755cbddbdd66
This commit is contained in:
Greg Neagle
2009-09-17 15:18:02 +00:00
parent 7556630385
commit 89d6d06dfe
1 changed files with 4 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/client/munkilib/munkicommon.py
+4 -26
View File
@@ -387,29 +387,10 @@ def padVersionString(versString,tupleCount):
def getExtendedVersion(bundlepath):
"""
Returns five-part version number like Apple uses in package DB
Returns five-part version number like Apple uses in distribution
and flat packages
"""
versionPlist = os.path.join(bundlepath,"Contents","version.plist")
infoPlist = os.path.join(bundlepath,"Contents","Info.plist")
pl = {}
#if os.path.exists(versionPlist):
# pl = FoundationPlist.readPlist(versionPlist)
# if pl:
# shortVers = "0.0.0"
# sourceVers = "0"
# buildVers = "0"
# if "CFBundleShortVersionString" in pl:
# shortVers = padVersionString(pl["CFBundleShortVersionString"],3)
# if "SourceVersion" in pl:
# sourceVers = padVersionString(pl["SourceVersion"],1)
# if "BuildVersion" in pl:
# buildVers = padVersionString(pl["BuildVersion"],1)
# if os.path.exists(infoPlist):
# pl = FoundationPlist.readPlist(infoPlist)
# if 'IFMinorVersion' in pl:
# buildVers = padVersionString(pl['IFMinorVersion'],1)
# return shortVers + "." + sourceVers + "." + buildVers
infoPlist = os.path.join(bundlepath,"Contents","Info.plist")
if os.path.exists(infoPlist):
pl = FoundationPlist.readPlist(infoPlist)
if "CFBundleShortVersionString" in pl:
@@ -418,8 +399,7 @@ def getExtendedVersion(bundlepath):
return padVersionString(pl["CFBundleVersion"],5)
elif "Bundle versions string, short" in pl:
# another special case for JAMF Composer-generated packages. Wow.
return padVersionString(pl["Bundle versions string, short"],5)
return padVersionString(pl["Bundle versions string, short"],5)
else:
return "0.0.0.0.0"
@@ -529,8 +509,6 @@ def getOnePackageInfo(pkgpath):
pkginfo['name'] = pl["CFBundleName"]
if "IFPkgFlagInstalledSize" in pl:
# converting to int because plistlib barfs on longs. This might be a problem...
#pkginfo['installed_size'] = int(pl["IFPkgFlagInstalledSize"])
pkginfo['installed_size'] = pl["IFPkgFlagInstalledSize"]
pkginfo['version'] = getExtendedVersion(pkgpath)