Process self-serve uninstalls the same way we do self-serve installs;…

… avoids picking up a catalogs list from SelfServeManifest
munki · Mar 10, 2015 · 256ae69 · 256ae69
1 parent dbb9dac
commit 256ae69
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/code/client/munkilib/updatecheck.py b/code/client/munkilib/updatecheck.py
@@ -3023,8 +3023,10 @@ def check(client_id='', localmanifestpath=None):
                         item, cataloglist, installinfo)
 
             # we don't need to filter uninstalls
-            processManifestForKey(selfservemanifest, 'managed_uninstalls',
-                                  installinfo, cataloglist)
+            selfserveuninstalls = getManifestValueForKey(
+                selfservemanifest, 'managed_uninstalls') or []
+            for item in selfserveuninstalls:
+                unused_result = processRemoval(item, cataloglist, installinfo)
 
             # update optional_installs with install/removal info
             for item in installinfo['optional_installs']: