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

Retrieve SAPCode key in optionXML.xml for both RIBS and HD

Browse Source 
- so that we have this key regardless of RIBS and HD installers
- fixes #649
This commit is contained in:
Timothy Sutton
2016-08-12 09:56:23 -04:00
parent 1cfb4249bc
commit aabc0ea205
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/client/munkilib/adobeutils.py
View File

@@ -425,7 +425,8 @@ def parseOptionXML(option_xml_file):
# CS5 to CC 2015.0-2015.2 releases use RIBS, and we retrieve a
# display name, version and 'mediaSignature' for building installs
# items
# items. SAPCode is also stored so that we can later search by this
# key across both RIBS and HyperDrive installer metadata.
medias_elements = installinfo[0].getElementsByTagName('Medias')
if medias_elements:
media_elements = medias_elements[0].getElementsByTagName('Media')
@@ -435,6 +436,7 @@ def parseOptionXML(option_xml_file):
product['prodName'] = getXMLtextElement(media, 'prodName')
product['prodVersion'] = getXMLtextElement(
media, 'prodVersion')
product['SAPCode'] = getXMLtextElement(media, 'SAPCode')
setup_elements = media.getElementsByTagName('Setup')
if setup_elements:
mediaSignatureElements = setup_elements[