Merge lp:~brian-murray/ubuntu/oneiric/apport/tag-oopses-with-driver into lp:~ubuntu-core-dev/ubuntu/oneiric/apport/ubuntu

[Brian Murray]

Per https://launchpad.net/ubuntu/+spec/other-kernel-o-bug-handling it was decided to add a tag to kerneloops bug reports identifying the driver in which the Oops occurred. This branch does that.

It also adds the kerneloops package version for troubleshooting issues with the kerneloops package.

[Martin Pitt (pitti)]

Nice one, thanks!

review: Approve

=== modified file 'data/package-hooks/source_linux.py'
--- data/package-hooks/source_linux.py	2011-04-20 17:42:30 +0000
+++ data/package-hooks/source_linux.py	2011-07-14 15:26:33 +0000
@@ -4,6 +4,7 @@
 Contributors:
 Matt Zimmerman <[e-mail]>
 Martin Pitt <[e-mail]>
+Brian Murray <[e-mail]>
 
 This program is free software; you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
@@ -64,14 +65,17 @@
 
     if ('Failure' in report and report['Failure'] == 'oops'
             and 'OopsText' in report and os.path.exists(SUBMIT_SCRIPT)):
+        # tag kerneloopses with the version of the kerneloops package
+        attach_related_packages(report, ['kerneloops'])
         #it's from kerneloops, ask the user whether to submit there as well
         if ui is not None:
             summary = report['OopsText']
             # Some OopsText begin with "--- [ cut here ] ---", so remove it
-            summary = re.sub("---.*\n","",summary)
+            summary = re.sub("---.*\n", "", summary)
             first_line = re.match(".*\n", summary)
-            ip = re.search("IP\:.*\n", summary)
-            call_trace = re.search("Call Trace(.*\n){,10}",summary)
+            ip = re.search("(R|E)?IP\:.*\n", summary)
+            kernel_driver = re.search("(R|E)?IP is at.*\[(.*)\]\n", summary)
+            call_trace = re.search("Call Trace(.*\n){,10}", summary)
             oops = ''
             if first_line:
                 oops += first_line.group(0)
@@ -79,6 +83,8 @@
                 oops += ip.group(0)
             if call_trace:
                 oops += call_trace.group(0)
+            if kernel_driver:
+                report['Tags'] += 'kernel-driver-%s' % kernel_driver.group(2)
             if ui.yesno("This report may also be submitted to "
                 "http://kerneloops.org/ in order to help collect aggregate "
                 "information about kernel problems. This aids in identifying "
 
=== modified file 'debian/changelog'
--- debian/changelog	2011-07-14 04:30:53 +0000
+++ debian/changelog	2011-07-14 15:26:33 +0000
@@ -1,3 +1,11 @@
+apport (1.21.2-0ubuntu4) oneiric; urgency=low
+
+  * data/package-hooks/source_linux.py:
+    - tag kerneloops reports with the driver the Oops occurred in
+    - include kerneloops package version in kerneloops reports
+
+ -- Brian Murray <[e-mail]>  Thu, 14 Jul 2011 08:19:46 -0700
+
 apport (1.21.2-0ubuntu3) oneiric; urgency=low
 
   * data/general-hooks/ubuntu.py: add in casper package version to bugs