Merge lp:~brian-murray/ubuntu/oneiric/apport/fix-kernel-driver-tagging into lp:~ubuntu-core-dev/ubuntu/oneiric/apport/ubuntu

[Brian Murray]

The regex for kernel driver tagging was too specific and only matching EIP and not RIP since RIP messages don't contain 'is at'. You can see failures in bug 812765 and bug 814460.

Looking at some local kernel oops reports I have:

745213-OopsText.txt:RIP [<ffffffffa014c745>] v4l2_device_register_subdev+0x95/0x170 [videodev]
748727-OopsText.txt:RIP: 0010:[<ffffffffa00dcd3e>] [<ffffffffa00dcd3e>] i915_batchbuffer_info+0x10e/0x160 [i915]
751436-OopsText.txt:RIP: 0010:[<ffffffffa0188d3e>] [<ffffffffa0188d3e>] i915_batchbuffer_info+0x10e/0x160 [i915]
751744-OopsText.txt:RIP: 0010:[<ffffffffa005c433>] [<ffffffffa005c433>] drm_mode_connector_update_edid_property+0x43/0x1c0 [drm]

so this branch should ensure the oops reports gets tagged properly.

[Kees Cook (kees)]

Looks great to me. :)

review: Approve

[lp:~brian-murray/ubuntu/oneiric/apport/fix-kernel-driver-tagging]

1808. By Brian Murray on 2011-07-22

make RE more specific to avoid false positives

=== modified file 'data/package-hooks/source_linux.py'
--- data/package-hooks/source_linux.py	2011-07-18 22:34:45 +0000
+++ data/package-hooks/source_linux.py	2011-07-22 20:04:45 +0000
@@ -74,7 +74,7 @@
             summary = re.sub("---.*\n", "", summary)
             first_line = re.match(".*\n", summary)
             ip = re.search("(R|E)?IP\:.*\n", summary)
-            kernel_driver = re.search("(R|E)?IP is at.*\[(.*)\]\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:
@@ -84,7 +84,7 @@
             if call_trace:
                 oops += call_trace.group(0)
             if kernel_driver:
-                report['Tags'] += 'kernel-driver-%s' % kernel_driver.group(2)
+                report['Tags'] += 'kernel-driver-%s' % kernel_driver.group(3)
             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-22 14:51:26 +0000
+++ debian/changelog	2011-07-22 20:04:45 +0000
@@ -1,3 +1,10 @@
+apport (1.21.2-0ubuntu8) oneiric; urgency=low
+
+  * data/package-hooks/source_linux.py:
+    - ensure Oops with RIP get tagged with the kernel-driver
+
+ -- Brian Murray <[e-mail]>  Fri, 22 Jul 2011 09:34:46 -0700
+
 apport (1.21.2-0ubuntu7) oneiric; urgency=low
 
   [ Martin Pitt ]