mirror/munki
1
0
Fork 0
mirror of https://github.com/munki/munki.git synced 2026-05-02 10:19:32 -05:00
Code Issues Packages Projects Releases Wiki Activity

updatecheck now recognizes "forced_install" as a synonym for "unattended_install" and "forced_uninstall" as a synonym for "unattended_uninstall".

Browse Source 
git-svn-id: http://munki.googlecode.com/svn/trunk@1100 a4e17f2e-e282-11dd-95e1-755cbddbdd66
This commit is contained in:
Greg Neagle
2011-04-08 17:03:54 +00:00
parent e84453eb5f
commit c0c0e2604c
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/client/munkilib/updatecheck.py
+5 -4
View File
@@ -1511,7 +1511,8 @@ def processInstall(manifestitem, cataloglist, installinfo):
# we will ignore the unattended_install key if the item needs a
# restart or logout...
if item_pl.get('unattended_install'):
if (item_pl.get('unattended_install') or
item_pl.get('forced_install')):
if item_pl.get('RestartAction'):
munkicommon.display_warning(
'Ignoring unattended_install key for %s '
@@ -1843,7 +1844,8 @@ def processRemoval(manifestitem, cataloglist, installinfo):
# we will ignore the unattended_uninstall key if the item needs a restart
# or logout...
if uninstall_item.get('unattended_uninstall'):
if (uninstall_item.get('unattended_uninstall') or
uninstall_item.get('forced_uninstall')):
if uninstall_item.get('RestartAction'):
munkicommon.display_warning(
'Ignoring unattended_uninstall key for %s '
@@ -2754,8 +2756,7 @@ def check(client_id='', localmanifestpath=None):
cataloglist = getManifestValueForKey(mainmanifestpath, 'catalogs')
autoremovalitems = getAutoRemovalItems(installinfo, cataloglist)
if autoremovalitems:
munkicommon.display_detail(
'**Checking for implicit removals**')
munkicommon.display_detail('**Checking for implicit removals**')
for item in autoremovalitems:
if munkicommon.stopRequested():
return 0