Merge lp:~gothicx/apport/failure_key_error into lp:~apport-hackers/apport/trunk

[Marco Rodrigues]

[Martin Pitt (pitti)]

This looks like it desperately tries to make apportcheckresume create a report if you just call it without any arguments and manually.

apportcheckresume isn't meant to be used like that, it's called from pm-utils on failure, which will provide the data it needs.

I'm fine with fixing the exception in favor of printing a "don't call me" error message, but it shouldn't produce a report which people could send, since it would be meaningless and just clutter the bug database.

Thanks, Martin

review: Needs Fixing

Unmerged revisions

1573. By Marco Rodrigues on 2009-09-06

Check if key Failure exist before add it to Tags

=== modified file 'bin/apportcheckresume'
--- bin/apportcheckresume	2009-04-30 13:41:03 +0000
+++ bin/apportcheckresume	2009-09-06 16:43:37 +0000
@@ -42,10 +42,12 @@
         apport.hookutils.attach_file_if_exists(pr, stresslog, 'StressLog')
 
         # Ensure we are appropriatly tagged.
-        pr['Tags'] = 'resume ' + pr['Failure']
+        if pr.has_key('Failure'):
+            pr['Tags'] = 'resume ' + pr['Failure']
 
         # Record the failure mode.
-        pr['Failure'] += '/resume'
+        if pr.has_key('Failure'):
+            pr['Failure'] += '/resume'
 
         # If we had a late hang pull in the resume-hang logfile.  Also
         # add an additional tag so we can pick these out.
@@ -54,7 +56,7 @@
             pr['Tags'] += ' resume-late-hang'
 
         # Generate a sensible report message.
-        if pr['Failure'] == 'suspend/resume':
+        if pr.has_key('Failure') and pr['Failure'] == 'suspend/resume':
             pr['Annotation'] = _('This occured during a previous suspend and prevented it from resuming properly.')
         else:
             pr['Annotation'] = _('This occured during a previous hibernate and prevented it from resuming properly.')
@@ -62,7 +64,9 @@
         # If we had a late hang make sure the dialog is clear that they may
         # not have noticed.  Also update the bug title so we notice.
         if os.path.exists(hanglog):
-            pr['Annotation'] += '  ' + _("The resume processing hung very near the end and will have appeared to have completed normally.")
+            pr['Annotation'] += '  ' + _('The resume processing hung very near the end and will have appeared to have completed normally.')
+
+        if pr.has_key('Failure'):
             pr['Failure'] = 'late resume'
 
         if pr.check_ignored():
@@ -83,5 +87,3 @@
 
 if __name__ == "__main__":
     sys.exit(main())
-
-