Merge lp:~brian-murray/apport/recoverable-problem-dupesig into lp:~apport-hackers/apport/trunk

[Brian Murray]

Really create a better duplicate signature using ExecutablePath fixing bug 1316763.

[Martin Pitt (pitti)]

Thanks!

review: Approve

=== modified file 'data/recoverable_problem'
--- data/recoverable_problem	2014-10-13 20:32:11 +0000
+++ data/recoverable_problem	2015-04-15 20:43:11 +0000
@@ -62,10 +62,9 @@
     report.add_user_info()
 
     ds = report.get('DuplicateSignature', '')
-    package = report.get('Package', '')
-    if package and ds:
-        package = package.split()[0]
-        report['DuplicateSignature'] = '%s:%s' % (package, ds)
+    exec_path = report.get('ExecutablePath', '')
+    if exec_path and ds:
+        report['DuplicateSignature'] = '%s:%s' % (exec_path, ds)
 
     # Write the final report
     with open(apport.fileutils.make_report_path(report), 'wb') as fp:
 
=== modified file 'test/test_recoverable_problem.py'
--- test/test_recoverable_problem.py	2014-05-14 20:58:42 +0000
+++ test/test_recoverable_problem.py	2015-04-15 20:43:11 +0000
@@ -59,14 +59,16 @@
             self.assertTrue('Pid:\t%d' % os.getpid() in report['ProcStatus'])
 
     def test_recoverable_problem_dupe_sig(self):
-        '''recoverable_problem duplicate signature includes package'''
+        '''recoverable_problem duplicate signature includes ExecutablePath'''
 
         self.call_recoverable_problem('Package\0test\0DuplicateSignature\0ds')
         path = self.wait_for_report()
         with open(path, 'rb') as report_path:
             report = apport.report.Report()
             report.load(report_path)
-            self.assertEqual(report['DuplicateSignature'], 'test:ds')
+            exec_path = report.get('ExecutablePath')
+            self.assertEqual(report['DuplicateSignature'], '%s:ds' %
+                             (exec_path))
             self.assertTrue('Pid:\t%d' % os.getpid() in report['ProcStatus'])
 
     def test_invalid_data(self):