From aabc0ea2051cb3abc2d93d2b7db289fbca92158c Mon Sep 17 00:00:00 2001 From: Timothy Sutton Date: Fri, 12 Aug 2016 09:56:23 -0400 Subject: [PATCH] Retrieve `SAPCode` key in optionXML.xml for both RIBS and HD - so that we have this key regardless of RIBS and HD installers - fixes #649 --- code/client/munkilib/adobeutils.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/code/client/munkilib/adobeutils.py b/code/client/munkilib/adobeutils.py index f4936dab..db6a5b48 100644 --- a/code/client/munkilib/adobeutils.py +++ b/code/client/munkilib/adobeutils.py @@ -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[