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

Proposed by Brian Murray
Status: Merged
Merged at revision: 1809
Proposed branch: lp:~brian-murray/ubuntu/oneiric/apport/kernel-driver-tagging-improvement
Merge into: lp:~ubuntu-core-dev/ubuntu/oneiric/apport/ubuntu
Diff against target: 36 lines (+13/-1)
2 files modified
data/package-hooks/source_linux.py (+5/-1)
debian/changelog (+8/-0)
To merge this branch: bzr merge lp:~brian-murray/ubuntu/oneiric/apport/kernel-driver-tagging-improvement
Reviewer Review Type Date Requested Status
Ubuntu Core Development Team Pending
Review via email: mp+69109@code.launchpad.net
To post a comment you must log in.
1810. By Brian Murray

add grub-pc to related package version if an apport-package bug

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-07-22 20:02:50 +0000
3+++ data/package-hooks/source_linux.py 2011-07-25 19:41:42 +0000
4@@ -84,7 +84,7 @@
5 if call_trace:
6 oops += call_trace.group(0)
7 if kernel_driver:
8- report['Tags'] += 'kernel-driver-%s' % kernel_driver.group(3)
9+ report['Tags'] += ' kernel-driver-%s' % kernel_driver.group(3)
10 if ui.yesno("This report may also be submitted to "
11 "http://kerneloops.org/ in order to help collect aggregate "
12 "information about kernel problems. This aids in identifying "
13@@ -95,3 +95,7 @@
14 text = report['OopsText']
15 proc = subprocess.Popen(SUBMIT_SCRIPT, stdin=subprocess.PIPE)
16 proc.communicate(text)
17+
18+ if report.get('ProblemType') == 'Package':
19+ # in case there is a failure with a grub script
20+ attach_related_packages(report, ['grub-pc'])
21
22=== modified file 'debian/changelog'
23--- debian/changelog 2011-07-22 20:32:49 +0000
24+++ debian/changelog 2011-07-25 19:41:42 +0000
25@@ -1,3 +1,11 @@
26+apport (1.21.2-0ubuntu9) oneiric; urgency=low
27+
28+ * data/package-hooks/source_linux.py:
29+ - kernel driver tag needs a space before it
30+ - add grub-pc to related package version if an apport-package bug
31+
32+ -- Brian Murray <brian@ubuntu.com> Mon, 25 Jul 2011 12:36:54 -0700
33+
34 apport (1.21.2-0ubuntu8) oneiric; urgency=low
35
36 * data/package-hooks/source_linux.py:

Subscribers

People subscribed via source and target branches