commit c97d96162455f9474a2ae0a0b1a8833dc4a58e43 Author: Greg Neagle Date: Tue Jan 8 11:00:41 2019 -0800 Provide switch for MunkiStatus output so precache_agent can switch it off. Addresses #897 diff --git a/code/client/managedsoftwareupdate b/code/client/managedsoftwareupdate index fac291dd..15f78e1f 100755 --- a/code/client/managedsoftwareupdate +++ b/code/client/managedsoftwareupdate @@ -778,7 +778,7 @@ def main(): exit(constants.EXIT_STATUS_INVALID_PARAMETERS) # set munkicommon globals - display.munkistatusoutput = options.munkistatusoutput + display.munkistatusoutput = True display.verbose = options.verbose # Set environment variable for verbosity diff --git a/code/client/munkilib/display.py b/code/client/munkilib/display.py index 25905814..6231b38e 100644 --- a/code/client/munkilib/display.py +++ b/code/client/munkilib/display.py @@ -30,6 +30,7 @@ from . import reports from . import munkistatus + def _getsteps(num_of_steps, limit): """ Helper function for display_percent_done @@ -55,7 +56,8 @@ def display_percent_done(current, maximum): percentdone = 100 else: percentdone = int(float(current)/float(maximum)*100) - munkistatus.percent(str(percentdone)) + if munkistatusoutput: + munkistatus.percent(str(percentdone)) if verbose: step = _getsteps(16, maximum) @@ -116,9 +118,10 @@ def display_status_major(msg, *args): """ msg = _concat_message(msg, *args) munkilog.log(msg) - munkistatus.message(msg) - munkistatus.detail('') - munkistatus.percent(-1) + if munkistatusoutput: + munkistatus.message(msg) + munkistatus.detail('') + munkistatus.percent(-1) if verbose: if msg.endswith('.') or msg.endswith(u'…'): print '%s' % msg.encode('UTF-8') @@ -134,7 +137,8 @@ def display_status_minor(msg, *args): """ msg = _concat_message(msg, *args) munkilog.log(u' ' + msg) - munkistatus.detail(msg) + if munkistatusoutput: + munkistatus.detail(msg) if verbose: if msg.endswith('.') or msg.endswith(u'…'): print ' %s' % msg.encode('UTF-8') @@ -230,7 +234,7 @@ def display_error(msg, *args): # module globals # pylint: disable=invalid-name verbose = 1 -munkistatusoutput = False +munkistatusoutput = True # pylint: enable=invalid-name diff --git a/code/client/precache_agent b/code/client/precache_agent index 136b0793..d89ad077 100755 --- a/code/client/precache_agent +++ b/code/client/precache_agent @@ -23,9 +23,13 @@ A privileged agent that downloads optional installs items marked for precaching. """ import time +from munkilib import display from munkilib.updatecheck import download + if __name__ == '__main__': + # turn off Munki status output; this should be silent + display.munkistatusoutput = False download.cache() # sleep 10 seconds to prevent launchd from complaining time.sleep(10) diff --git a/code/client/removepackages b/code/client/removepackages index d24c7f69..033e1760 100755 --- a/code/client/removepackages +++ b/code/client/removepackages @@ -70,7 +70,7 @@ def main(): exit(-1) # set the display globals - display.munkistatusoutput = options.munkistatusoutput + display.munkistatusoutput = True display.verbose = options.verbose if options.munkistatusoutput: