mirror/munki
1
0
Fork 0
mirror of https://github.com/munki/munki.git synced 2026-02-04 22:30:10 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'Munki7dev' into custom-sidebar

Browse Source
This commit is contained in:
Greg Neagle
2025-08-15 10:35:11 -07:00
parent fea10ce591 6ce2321a4a
commit 7d260ed4ca
1 changed files with 10 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
code/client/munkilib/admin/pkginfolib.py
View File

@@ -329,14 +329,21 @@ def getiteminfo(itempath):
directory and gets additional metadata for later comparison.
"""
infodict = {}
if pkgutils.isApplication(itempath):
infodict['type'] = 'application'
infodict['path'] = itempath
if (os.path.exists(os.path.join(itempath, 'Contents', 'Info.plist')) or
os.path.exists(os.path.join(itempath, 'Resources', 'Info.plist'))):
if pkgutils.isApplication(itempath):
infodict['type'] = 'application'
infodict['path'] = itempath
else:
infodict['type'] = 'bundle'
infodict['path'] = itempath
plist = pkgutils.getBundleInfo(itempath)
# Extract the same keys as applications
for key in ['CFBundleName', 'CFBundleIdentifier',
'CFBundleShortVersionString', 'CFBundleVersion']:
if key in plist:
infodict[key] = plist[key]
# Also extract minimum OS version info like applications
if 'LSMinimumSystemVersion' in plist:
infodict['minosversion'] = plist['LSMinimumSystemVersion']
elif 'LSMinimumSystemVersionByArchitecture' in plist:
@@ -350,15 +357,6 @@ def getiteminfo(itempath):
infodict['minosversion'] = \
plist['SystemVersionCheck:MinimumSystemVersion']
elif (os.path.exists(os.path.join(itempath, 'Contents', 'Info.plist')) or
os.path.exists(os.path.join(itempath, 'Resources', 'Info.plist'))):
infodict['type'] = 'bundle'
infodict['path'] = itempath
plist = pkgutils.getBundleInfo(itempath)
for key in ['CFBundleShortVersionString', 'CFBundleVersion']:
if key in plist:
infodict[key] = plist[key]
elif itempath.endswith("Info.plist") or itempath.endswith("version.plist"):
infodict['type'] = 'plist'
infodict['path'] = itempath
@@ -389,7 +387,6 @@ def getiteminfo(itempath):
infodict['md5checksum'] = munkihash.getmd5hash(itempath)
return infodict
def makepkginfo(installeritem, options):
'''Return a pkginfo dictionary for item'''