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

When checking for evidence of installation when evaluating a managed_uninstall, do not be fooled by an empty installs array.

Browse Source
This commit is contained in:
Greg Neagle
2018-05-30 13:54:50 -07:00
parent 2d0e4797c5
commit 4bc577bb97
1 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
code/client/munkilib/updatecheck/installationstate.py
View File

@@ -264,17 +264,18 @@ def evidence_this_is_installed(item_pl):
item_pl.get('uninstall_method') != 'removepackages'):
display.display_debug2("Checking 'installs' items...")
installitems = item_pl['installs']
foundallinstallitems = True
for item in installitems:
if 'path' in item:
# we can only check by path; if the item has been moved
# we're not clever enough to find it, and our removal
# methods are currently even less clever
if not os.path.exists(item['path']):
# this item isn't on disk
display.display_debug2(
'%s not found on disk.', item['path'])
foundallinstallitems = False
if installitems:
foundallinstallitems = True
for item in installitems:
if 'path' in item:
# we can only check by path; if the item has been moved
# we're not clever enough to find it, and our removal
# methods are currently even less clever
if not os.path.exists(item['path']):
# this item isn't on disk
display.display_debug2(
'%s not found on disk.', item['path'])
foundallinstallitems = False
if (foundallinstallitems and
item_pl.get('uninstall_method') != 'removepackages'):
return True