commit 0bd202281e5acab29ae3f1e248912a8d48b1f0f1 Author: Greg Neagle Date: Tue Dec 18 08:23:47 2018 -0800 Fix and tweak detection of need to shutdown for apple updates diff --git a/code/client/munkilib/appleupdates/au.py b/code/client/munkilib/appleupdates/au.py index 41689091..35751096 100644 --- a/code/client/munkilib/appleupdates/au.py +++ b/code/client/munkilib/appleupdates/au.py @@ -656,13 +656,15 @@ class AppleUpdates(object): elif 'Missing bundle identifier' in output: # don't display this, it's noise pass - elif output == '': - pass - elif output.contains('Please call halt'): + elif (('Please call halt' in output + or 'your computer must shut down' in output) + and not self.shutdown_instead_of_restart): # This update requires we shutdown instead of a restart. display.display_status_minor(output) display.display_info('### This update requires a shutdown. ###') self.shutdown_instead_of_restart = True + elif output == '': + pass else: display.display_status_minor(output)