mirror/munki
1
0
Fork 0
mirror of https://github.com/munki/munki.git synced 2026-04-29 00:39:42 -05:00
Code Issues Packages Projects Releases Wiki Activity

Filter out non-HD installers when searching for prodVersion metadata

Browse Source
This commit is contained in:
Timothy Sutton
2016-08-12 11:39:02 -04:00
parent aabc0ea205
commit 0e942ce45f
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/client/munkilib/adobeutils.py
+6 -2
View File
@@ -1313,11 +1313,15 @@ def getAdobeCatalogInfo(mountpoint, pkgname=""):
# package doesn't have this key set.
if pkg.get('Type') == 'core':
# We can't use 'ProductVersion' from Application.json for the part following
# the SAP code, because it's usually too specific and won't match the "short"
# the SAPCode, because it's usually too specific and won't match the "short"
# product version. We can take 'prodVersion' from the optionXML.xml instead.
# We filter out any non-HD installers to avoid matching up the wrong versions
# for packages that may contain multiple different major versions of a given
# SAPCode
pkg_prod_vers = [prod['prodVersion']
for prod in option_xml_info['products']
if prod['SAPCode'] == app_info['SAPCode']][0]
if prod.get('hd_installer') and \
prod['SAPCode'] == app_info['SAPCode']][0]
uninstall_file_name = '_'.join([
app_info['SAPCode'],
pkg_prod_vers.replace('.', '_'),