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

Proposed by Brian Murray on 2011-07-14
Status: Merged
Merged at revision: 1796
Proposed branch: lp:~brian-murray/ubuntu/oneiric/apport/tag-oopses-with-driver
Merge into: lp:~ubuntu-core-dev/ubuntu/oneiric/apport/ubuntu
Diff against target: 57 lines (+17/-3)
2 files modified
data/package-hooks/source_linux.py (+9/-3)
debian/changelog (+8/-0)
To merge this branch: bzr merge lp:~brian-murray/ubuntu/oneiric/apport/tag-oopses-with-driver
Reviewer Review Type Date Requested Status
Martin Pitt 2011-07-14 Approve on 2011-07-14
Review via email: mp+67979@code.launchpad.net

Description of the change

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.

To post a comment you must log in.
Martin Pitt (pitti) wrote :

Nice one, thanks!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'data/package-hooks/source_linux.py'
2--- data/package-hooks/source_linux.py 2011-04-20 17:42:30 +0000
3+++ data/package-hooks/source_linux.py 2011-07-14 15:26:33 +0000
4@@ -4,6 +4,7 @@
5 Contributors:
6 Matt Zimmerman <mdz@canonical.com>
7 Martin Pitt <martin.pitt@canonical.com>
8+Brian Murray <brian@canonical.com>
9
10 This program is free software; you can redistribute it and/or modify it
11 under the terms of the GNU General Public License as published by the
12@@ -64,14 +65,17 @@
13
14 if ('Failure' in report and report['Failure'] == 'oops'
15 and 'OopsText' in report and os.path.exists(SUBMIT_SCRIPT)):
16+ # tag kerneloopses with the version of the kerneloops package
17+ attach_related_packages(report, ['kerneloops'])
18 #it's from kerneloops, ask the user whether to submit there as well
19 if ui is not None:
20 summary = report['OopsText']
21 # Some OopsText begin with "--- [ cut here ] ---", so remove it
22- summary = re.sub("---.*\n","",summary)
23+ summary = re.sub("---.*\n", "", summary)
24 first_line = re.match(".*\n", summary)
25- ip = re.search("IP\:.*\n", summary)
26- call_trace = re.search("Call Trace(.*\n){,10}",summary)
27+ ip = re.search("(R|E)?IP\:.*\n", summary)
28+ kernel_driver = re.search("(R|E)?IP is at.*\[(.*)\]\n", summary)
29+ call_trace = re.search("Call Trace(.*\n){,10}", summary)
30 oops = ''
31 if first_line:
32 oops += first_line.group(0)
33@@ -79,6 +83,8 @@
34 oops += ip.group(0)
35 if call_trace:
36 oops += call_trace.group(0)
37+ if kernel_driver:
38+ report['Tags'] += 'kernel-driver-%s' % kernel_driver.group(2)
39 if ui.yesno("This report may also be submitted to "
40 "http://kerneloops.org/ in order to help collect aggregate "
41 "information about kernel problems. This aids in identifying "
42
43=== modified file 'debian/changelog'
44--- debian/changelog 2011-07-14 04:30:53 +0000
45+++ debian/changelog 2011-07-14 15:26:33 +0000
46@@ -1,3 +1,11 @@
47+apport (1.21.2-0ubuntu4) oneiric; urgency=low
48+
49+ * data/package-hooks/source_linux.py:
50+ - tag kerneloops reports with the driver the Oops occurred in
51+ - include kerneloops package version in kerneloops reports
52+
53+ -- Brian Murray <brian@ubuntu.com> Thu, 14 Jul 2011 08:19:46 -0700
54+
55 apport (1.21.2-0ubuntu3) oneiric; urgency=low
56
57 * data/general-hooks/ubuntu.py: add in casper package version to bugs

Subscribers

People subscribed via source and target branches