Revert "After doing unattended installs, don't recheck Apple updates availability if there were none available when we started (or we weren't supposed to check them at all)"

This reverts commit f02cde7f5d.
This commit is contained in:
Greg Neagle
2016-06-29 17:01:10 -04:00
parent f02cde7f5d
commit 97499e703c
+10 -13
View File
@@ -932,19 +932,16 @@ def main():
# so we need to check InstallInfo.plist and
# AppleUpdates.plist again
updatesavailable = munkiUpdatesAvailable()
if appleupdatesavailable:
# there were Apple updates available, but we might have
# installed some unattended
try:
appleupdatesavailable = (
appleupdates.appleSoftwareUpdatesAvailable(
suppresscheck=True, client_id=options.id))
except:
munkicommon.display_error(
'Unexpected error in appleupdates:')
munkicommon.log(traceback.format_exc())
munkicommon.savereport()
raise
try:
appleupdatesavailable = \
appleupdates.appleSoftwareUpdatesAvailable(
suppresscheck=True, client_id=options.id)
except:
munkicommon.display_error(
'Unexpected error in appleupdates:')
munkicommon.log(traceback.format_exc())
munkicommon.savereport()
raise
if appleupdatesavailable or updatesavailable:
# set a flag to notify the user of available updates
# after we conclude this run.