mirror/munki
1
0
Fork 0
mirror of https://github.com/munki/munki.git synced 2026-01-27 09:29:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix for optional_installs managed_uninstalls -- bad intentation

Browse Source
This commit is contained in:
Greg Neagle
2012-02-03 17:28:58 -08:00
parent 4071808f6e
commit 856a943ff3
1 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2339,7 +2339,13 @@ def check(client_id='', localmanifestpath=None):
except OSError:
pass
except FoundationPlist.FoundationPlistException:
pass
# problem reading the usermanifest
# better remove it
munkicommon.display_error('Could not read %s' % usermanifest)
try:
os.unlink(usermanifest)
except OSError:
pass
if os.path.exists(selfservemanifest):
# use catalogs from main manifest for self-serve manifest
@@ -2350,7 +2356,7 @@ def check(client_id='', localmanifestpath=None):
selfserveinstalls = getManifestValueForKey(selfservemanifest,
'managed_installs')
available_optional_installs = [item['name']
for item in installinfo.get('optional_installs',[])]
for item in installinfo.get('optional_installs', [])]
if selfserveinstalls:
# filter the list, removing any items not in the current list
# of available self-serve installs
@@ -2359,9 +2365,10 @@ def check(client_id='', localmanifestpath=None):
for item in selfserveinstalls:
unused_result = processInstall(
item, cataloglist, installinfo)
# we don't need to filter uninstalls
processManifestForKey(selfservemanifest, 'managed_uninstalls',
installinfo, cataloglist)
# we don't need to filter uninstalls
processManifestForKey(selfservemanifest, 'managed_uninstalls',
installinfo, cataloglist)
# update optional_installs with install/removal info
for item in installinfo['optional_installs']: