Fix for issue when MSU.app is launched by managedsoftwareupdate more than one minute after an updatecheck run has completed (due to unattended installs, apple update checking, or combo) and add AppleUpdates to ManagedSoftwareReport.plist

code/client/managedsoftwareupdate

@@ -716,6 +716,10 @@ def main():
                 # however Apple Updates have not been affected by the
                 # unattended install tasks (so that check is still valid).
                 if appleupdatesavailable or munkiUpdatesAvailable():
+                    # it may have been more than a minute since we ran our
+                    # original updatecheck so tickle the updatecheck time
+                    # so MSU.app knows to display results immediately
+                    recordUpdateCheckResult(1)
                     consoleuser = munkicommon.getconsoleuser()
                     if consoleuser == u'loginwindow':
                         # someone is logged in, but we're sitting at

code/client/munkilib/appleupdates.py

@@ -684,6 +684,7 @@ class AppleUpdates(object):
             return
         apple_updates = pl_dict.get('AppleUpdates', [])
         if apple_updates:
+            munkicommon.report['AppleUpdates'] = apple_updates
             munkicommon.display_info(
                 'The following Apple Software Updates are available to '
                 'install:')