Merge lp:~brian-murray/apport/fix-SAS-generation into lp:~apport-hackers/apport/trunk

[Brian Murray]

[lp:~brian-murray/apport/fix-SAS-generation]

3046. By Brian Murray on 2016-01-14

remove apport-retrace change

[Martin Pitt (pitti)]

Conceptually this looks wrong to me, so I reject this for now, sorry. Let's continue discussion in the bug what we really want to fix here. Thanks!

review: Disapprove

Unmerged revisions

3046. By Brian Murray on 2016-01-14

remove apport-retrace change

3045. By Brian Murray on 2016-01-12

Only use crash_signature_addresses() as a fallback and prefer crash_signature().

3044. By Brian Murray on 2016-01-06

If we cannot write to the output file, write to a new report rather than crash.

=== modified file 'apport/report.py'
--- apport/report.py	2015-10-27 13:05:47 +0000
+++ apport/report.py	2016-01-14 16:46:50 +0000
@@ -673,6 +673,8 @@
           inclusion into bug reports and easier processing
         - AssertionMessage: Value of __abort_msg, __glib_assert_msg, or
           __nih_abort_msg if present
+        - StacktraceAddressSignature: A signature suitable for identifying
+          duplicates.
 
         The optional rootdir can specify a root directory which has the
         executable, libraries, and debug symbols. This does not require
@@ -751,7 +753,9 @@
 
         if 'Stacktrace' in self:
             self._gen_stacktrace_top()
-            addr_signature = self.crash_signature_addresses()
+            addr_signature = self.crash_signature()
+            if not addr_signature:
+                addr_signature = self.crash_signature_addresses()
             if addr_signature:
                 self['StacktraceAddressSignature'] = addr_signature