Merge lp:~brian-murray/ubuntu/oneiric/apport/ubiquity-tag-oem-config into lp:~ubuntu-core-dev/ubuntu/oneiric/apport/ubuntu

Proposed by Brian Murray on 2011-08-30
Status: Merged
Merged at revision: 1836
Proposed branch: lp:~brian-murray/ubuntu/oneiric/apport/ubiquity-tag-oem-config
Merge into: lp:~ubuntu-core-dev/ubuntu/oneiric/apport/ubuntu
Diff against target: 37 lines (+10/-4)
2 files modified
data/package-hooks/source_ubiquity.py (+3/-4)
debian/changelog (+7/-0)
To merge this branch: bzr merge lp:~brian-murray/ubuntu/oneiric/apport/ubiquity-tag-oem-config
Reviewer Review Type Date Requested Status
Martin Pitt 2011-08-30 Approve on 2011-09-01
Ubuntu Core Development Team 2011-08-30 Pending
Review via email: mp+73452@code.launchpad.net

Description of the change

Apparently oem-config doesn't always appear in the Ubiquity line with the version of ubiquity in '/var/log/installer/syslog' so a better check would be to use the existence of the OemConfigLog to determine whether or not to add the oem-config tag to a bug report.

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

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_ubiquity.py'
2--- data/package-hooks/source_ubiquity.py 2011-08-30 04:35:30 +0000
3+++ data/package-hooks/source_ubiquity.py 2011-08-30 21:58:23 +0000
4@@ -83,11 +83,8 @@
5 if match:
6 match = match.group(1)
7 report.setdefault('Tags', '')
8- if match and 'oem-config' in match:
9+ if match:
10 report['Tags'] += ' ubiquity-%s' % match.split()[0]
11- report['Tags'] += ' oem-config'
12- elif match:
13- report['Tags'] += ' ubiquity-%s' % match
14
15 add_installation_log(report, 'UbiquityPartman', 'partman')
16 if os.path.exists('/var/log/installer/debug'):
17@@ -99,3 +96,5 @@
18 add_installation_log(report, 'UbiquityDm', 'dm')
19 add_installation_log(report, 'Casper', 'casper.log')
20 add_installation_log(report, 'OemConfigLog', 'oem-config.log')
21+ if 'OemConfigLog' in report:
22+ report['Tags'] += ' oem-config'
23
24=== modified file 'debian/changelog'
25--- debian/changelog 2011-08-30 04:35:46 +0000
26+++ debian/changelog 2011-08-30 21:58:23 +0000
27@@ -1,3 +1,10 @@
28+apport (1.22-0ubuntu4) oneiric; urgency=low
29+
30+ * data/package-hooks/source_ubiquity.py: Use attachment OemConfigLog to determine
31+ whether or not to tag the bug oem-config not information in syslog
32+
33+ -- Brian Murray <brian@ubuntu.com> Tue, 30 Aug 2011 13:09:14 -0700
34+
35 apport (1.22-0ubuntu3) oneiric; urgency=low
36
37 * data/package-hooks/source_ubiquity.py: Fix crash on undefined 'version'.

Subscribers

People subscribed via source and target branches