← Back to team overview

apport-hackers team mailing list archive

[Merge] lp:~brian-murray/apport/no-unreportable into lp:apport

 

Brian Murray has proposed merging lp:~brian-murray/apport/no-unreportable into lp:apport.

Requested reviews:
  Apport upstream developers (apport-hackers)
Related bugs:
  Bug #1039220 in apport (Ubuntu): "don't report crashes for programs that don't match the file on disk (like for kernel crashes)"
  https://bugs.launchpad.net/ubuntu/+source/apport/+bug/1039220

For more details, see:
https://code.launchpad.net/~brian-murray/apport/no-unreportable/+merge/126082
-- 
https://code.launchpad.net/~brian-murray/apport/no-unreportable/+merge/126082
Your team Apport upstream developers is requested to review the proposed merge of lp:~brian-murray/apport/no-unreportable into lp:apport.
=== modified file 'apport/ui.py'
--- apport/ui.py	2012-09-19 08:20:47 +0000
+++ apport/ui.py	2012-09-24 20:01:32 +0000
@@ -280,10 +280,13 @@
             if not response['report']:
                 return
 
+            if self.check_unreportable():
+                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.
+            # We check for duplicates here, rather than before we show the
+            # dialog, as we want to submit these to the crash database, but
+            # not Launchpad.
             if self.crashdb.accepts(self.report):
                 # FIXME: This behaviour is not really correct, but necessary as
                 # long as we only support a single crashdb and have whoopsie
@@ -292,8 +295,6 @@
                 # the DBs wants the report. See LP#957177 for details.
                 if self.handle_duplicate():
                     return
-                if self.check_unreportable():
-                    return
                 self.file_report()
         except IOError as e:
             # fail gracefully if file is not readable for us