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

[Brian Murray]

suspend resume failures have no duplicate signature so aren't bucketed in the error tracker. This fixes that by using report.crash_signature().

[lp:~brian-murray/apport/bug-1316841]

2801. By Brian Murray on 2014-05-09

add some more whitespace

[Martin Pitt (pitti)]

Thanks!

review: Approve

=== modified file 'NEWS'
--- NEWS	2014-05-06 05:59:20 +0000
+++ NEWS	2014-05-09 20:12:06 +0000
@@ -5,6 +5,8 @@
 -------------------
  * Add kernel package version to the various kernel-related hooks. Thanks Brian
    Murray.
+ * Add a duplicate signature to suspend resume failures. Thanks Brian Murray.
+   (LP: #1316841)
 
 2.14.2 (2014-04-30)
 -------------------

=== modified file 'data/apportcheckresume'
--- data/apportcheckresume	2014-04-29 17:41:29 +0000
+++ data/apportcheckresume	2014-05-09 20:12:06 +0000
@@ -10,7 +10,6 @@
 # the full text of the license.
 
 import os
-import os.path
 import sys
 import datetime
 
@@ -84,6 +83,10 @@
         if pr.check_ignored():
             return 0
 
+        crash_signature = pr.crash_signature()
+        if crash_signature:
+            pr['DuplicateSignature'] = crash_signature
+
         nowtime = datetime.datetime.now()
         pr_filename = '/var/crash/susres.%s.crash' % (str(nowtime).replace(' ', '_'))
         with os.fdopen(os.open(pr_filename, os.O_WRONLY | os.O_CREAT | os.O_EXCL, 0o640), 'wb') as report_file: