From cdf27e4e4e69deec4e3529e410cf939f6acd2acc Mon Sep 17 00:00:00 2001 From: Greg Neagle Date: Mon, 11 Apr 2016 14:30:16 -0700 Subject: [PATCH] Make sure item as an uninstall_method before indicating it can be uninstalled in MSC --- .../Managed Software Center/MunkiItems.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/apps/Managed Software Center/Managed Software Center/MunkiItems.py b/code/apps/Managed Software Center/Managed Software Center/MunkiItems.py index 1b265a30..74fa5dc1 100644 --- a/code/apps/Managed Software Center/Managed Software Center/MunkiItems.py +++ b/code/apps/Managed Software Center/Managed Software Center/MunkiItems.py @@ -899,7 +899,8 @@ class OptionalItem(GenericItem): self['updatecheck_needed'] = True else: # not in managed_uninstalls if not self.get('needs_update'): - if self.get('uninstallable'): + if (self.get('uninstallable') + and self.get('uninstall_method'): status = u'installed' else: # not uninstallable status = u'installed-not-removable'