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

Add version to failed installs

Browse Source 
Add version_to_install to failed installs so that the version is recorded for reporting purposes
This commit is contained in:
Arjen van Bochoven
2016-07-03 21:28:13 +02:00
committed by GitHub
parent fa8895429e
commit b5ac9de944
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1839,6 +1839,7 @@ def processInstall(manifestitem, cataloglist, installinfo,
iteminfo['installed'] = False
iteminfo['note'] = ('Can\'t install %s because could not resolve all '
'dependencies.' % iteminfo['display_name'])
iteminfo['version_to_install'] = item_pl.get('version', 'UNKNOWN')
installinfo['managed_installs'].append(iteminfo)
return False
@@ -1980,6 +1981,7 @@ def processInstall(manifestitem, cataloglist, installinfo,
manifestitem)
iteminfo['installed'] = False
iteminfo['note'] = 'Integrity check failed'
iteminfo['version_to_install'] = item_pl.get('version', 'UNKNOWN')
installinfo['managed_installs'].append(iteminfo)
if manifestitemname in installinfo['processed_installs']:
installinfo['processed_installs'].remove(manifestitemname)
@@ -1989,6 +1991,7 @@ def processInstall(manifestitem, cataloglist, installinfo,
'Download of %s failed: %s', manifestitem, errmsg)
iteminfo['installed'] = False
iteminfo['note'] = 'Download failed (%s)' % errmsg
iteminfo['version_to_install'] = item_pl.get('version', 'UNKNOWN')
installinfo['managed_installs'].append(iteminfo)
if manifestitemname in installinfo['processed_installs']:
installinfo['processed_installs'].remove(manifestitemname)
@@ -1998,6 +2001,7 @@ def processInstall(manifestitem, cataloglist, installinfo,
'Can\'t install %s because: %s', manifestitemname, errmsg)
iteminfo['installed'] = False
iteminfo['note'] = '%s' % errmsg
iteminfo['version_to_install'] = item_pl.get('version', 'UNKNOWN')
installinfo['managed_installs'].append(iteminfo)
if manifestitemname in installinfo['processed_installs']:
installinfo['processed_installs'].remove(manifestitemname)