Merge lp:~brian-murray/apport/mark_upload into lp:~apport-hackers/apport/trunk

[Brian Murray]

As documented in bug 1020994 I discovered that whoopsie will sometimes upload an incomplete crash report and that this can happen because apport hasn't always finished running collect_info when the upload file is created.

I've already uploaded this fix to ubuntu in apport version 2.4-0ubuntu7.

=== modified file 'apport/ui.py'
--- apport/ui.py	2012-07-18 10:15:24 +0000
+++ apport/ui.py	2012-08-16 00:09:27 +0000
@@ -242,7 +242,9 @@
             response = self.ui_present_report_details(allowed_to_report)
             if response['report'] or response['examine']:
                 try:
-                    if 'Dependencies' not in self.report:
+                    if 'Dependencies' not in self.report and response['report']:
+                        self.collect_info(on_finished=apport.fileutils.mark_report_upload(report_file))
+                    elif 'Dependencies' not in self.report:
                         self.collect_info()
                 except (IOError, zlib.error) as e:
                     # can happen with broken core dumps
@@ -280,7 +282,6 @@
             if not response['report']:
                 return
 
-            apport.fileutils.mark_report_upload(report_file)
             # We check for duplicates and unreportable crashes here, rather
             # than before we show the dialog, as we want to submit these to the
             # crash database, but not Launchpad.