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

In getAdobeSetupInfo(), now print payload info even if there's only one payload Payload info now includes AdobeCode, which can be useful for building Installs items.

Browse Source 
git-svn-id: http://munki.googlecode.com/svn/trunk@413 a4e17f2e-e282-11dd-95e1-755cbddbdd66
This commit is contained in:
Greg Neagle
2009-12-19 05:14:56 +00:00
parent 68ab8e5c61
commit 5a7e380c55
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/client/munkilib/adobeutils.py
+8 -7
View File
@@ -81,6 +81,8 @@ def getPayloadInfo(dirpath):
propvalue = ''
for node in prop.childNodes:
propvalue += node.nodeValue
if propname == 'AdobeCode':
payloadinfo['AdobeCode'] = propvalue
if propname == 'ProductName':
payloadinfo['display_name'] = propvalue
if propname == 'ProductVersion':
@@ -156,18 +158,17 @@ def getAdobeSetupInfo(installroot):
if len(payloads) == 1:
info['display_name'] = payloads[0]['display_name']
info['version'] = payloads[0]['version']
info['installed_size'] = payloads[0]['installed_size']
else:
if not 'display_name' in info:
info['display_name'] = "ADMIN: choose from payloads"
info['payloads'] = payloads
if not 'version' in info:
info['version'] = "ADMIN please set me"
installed_size = 0
for payload in payloads:
installed_size = installed_size + \
payload.get('installed_size',0)
info['installed_size'] = installed_size
info['payloads'] = payloads
installed_size = 0
for payload in payloads:
installed_size = installed_size + \
payload.get('installed_size',0)
info['installed_size'] = installed_size
return info