mirror of
https://github.com/munki/munki.git
synced 2026-04-23 13:29:26 -05:00
Patch to adobeutils.py from Pepijn Bruienne <bruienne@gmail.com> to allow makepkginfo to properly parse an Adobe Creative Cloud product package built with Creative Cloud Packager.
This commit is contained in:
@@ -79,13 +79,18 @@ def getCS5mediaSignature(dirpath):
|
||||
'''Returns the CS5 mediaSignature for an AAMEE CS5 install.
|
||||
dirpath is typically the root of a mounted dmg'''
|
||||
|
||||
deploymentmgr = findAdobeDeploymentManager(dirpath)
|
||||
if deploymentmgr:
|
||||
parentdir = os.path.join(os.path.dirname(deploymentmgr), "Setup")
|
||||
else:
|
||||
payloads_dir = ""
|
||||
# look for a payloads folder
|
||||
for (path, unused_dirs, unused_files) in os.walk(dirpath):
|
||||
if path.endswith("/payloads"):
|
||||
payloads_dir = path
|
||||
|
||||
# return empty-handed if we didn't find a payloads folder
|
||||
if not payloads_dir:
|
||||
return ""
|
||||
|
||||
# now look for setup.xml
|
||||
setupxml = os.path.join(parentdir, "payloads", "Setup.xml")
|
||||
setupxml = os.path.join(payloads_dir, "Setup.xml")
|
||||
if os.path.exists(setupxml) and os.path.isfile(setupxml):
|
||||
# parse the XML
|
||||
dom = minidom.parse(setupxml)
|
||||
|
||||
Reference in New Issue
Block a user