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

Reorder tasks at the end of a managedsoftwareupdate run so the munkistatus session is told it's done before we send a notification of pending updates.

Browse Source
This commit is contained in:
Greg Neagle
2020-06-30 20:43:06 -07:00
parent 2c7c10212c
commit 353d542974
1 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
code/client/managedsoftwareupdate
View File

@@ -1135,25 +1135,6 @@ def main():
if options.verbose:
print('Done.')
if notify_user:
# it may have been more than a minute since we ran our original
# updatecheck so tickle the updatecheck time so MSC.app knows to
# display results immediately
recordUpdateCheckResult(1)
if force_action:
notifyUserOfUpdates(force=True)
time.sleep(2)
startLogoutHelper()
elif osutils.getconsoleuser() == u'loginwindow':
# someone is logged in, but we're sitting at the loginwindow due to
# to fast user switching so do nothing
pass
elif not prefs.pref('SuppressUserNotification'):
notifyUserOfUpdates()
else:
munkilog.log('Skipping user notification because '
'SuppressUserNotification is true.')
osutils.cleanUpTmpDir()
if mustlogout:
# not handling this currently
@@ -1165,6 +1146,25 @@ def main():
else:
# tell status app we're done sending status
munkistatus.quit_app()
if notify_user:
# it may have been more than a minute since we ran our original
# updatecheck so tickle the updatecheck time so MSC.app knows to
# display results immediately
recordUpdateCheckResult(1)
if force_action:
notifyUserOfUpdates(force=True)
time.sleep(2)
startLogoutHelper()
elif osutils.getconsoleuser() == u'loginwindow':
# someone is logged in, but we're sitting at the loginwindow
# due to to fast user switching so do nothing
munkilog.log('Skipping user notification because we are at the'
'loginwindow.')
elif prefs.pref('SuppressUserNotification'):
munkilog.log('Skipping user notification because '
'SuppressUserNotification is true.')
else:
notifyUserOfUpdates()
if (runtype == 'checkandinstallatstartup' and
restart_action == constants.POSTACTION_NONE):