mirror/munki
1
0
Fork 0
mirror of https://github.com/munki/munki.git synced 2026-04-25 22:40:46 -05:00
Code Issues Packages Projects Releases Wiki Activity

Mark optional_item as uninstallable only if pkginfo uninstallable=True and there is a non-empty uninstall_method

Browse Source
This commit is contained in:
Greg Neagle
2016-04-11 17:28:09 -07:00
parent 6f8a1f805f
commit a5e2fae5e5
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/client/munkilib/updatecheck.py
+3 -1
View File
@@ -1628,7 +1628,9 @@ def processOptionalInstall(manifestitem, cataloglist, installinfo):
iteminfo['needs_update'] = (installedState(item_pl) == 0)
iteminfo['licensed_seat_info_available'] = item_pl.get(
'licensed_seat_info_available', False)
iteminfo['uninstallable'] = item_pl.get('uninstallable', False)
iteminfo['uninstallable'] = (
item_pl.get('uninstallable')
and (item_pl.get('uninstall_method', '') != ''))
iteminfo['installer_item_size'] = \
item_pl.get('installer_item_size', 0)
iteminfo['installed_size'] = item_pl.get(