Merge lp:~brian-murray/apport/ubiquity-dupe-sig-improvements into lp:~ubuntu-core-dev/ubuntu/oneiric/apport/ubuntu

Proposed by Brian Murray on 2011-09-12
Status: Merged
Merged at revision: 1842
Proposed branch: lp:~brian-murray/apport/ubiquity-dupe-sig-improvements
Merge into: lp:~ubuntu-core-dev/ubuntu/oneiric/apport/ubuntu
Diff against target: 27 lines (+8/-1)
2 files modified
data/package-hooks/source_ubiquity.py (+1/-1)
debian/changelog (+7/-0)
To merge this branch: bzr merge lp:~brian-murray/apport/ubiquity-dupe-sig-improvements
Reviewer Review Type Date Requested Status
Martin Pitt 2011-09-12 Approve on 2011-09-13
Review via email: mp+75050@code.launchpad.net
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-09-01 10:17:41 +0000
3+++ data/package-hooks/source_ubiquity.py 2011-09-12 17:51:23 +0000
4@@ -66,7 +66,7 @@
5 ui.information("The system log from your installation contains an error. The specific error commonly occurs when there is an issue with the media from which you were installing. This can happen when your media is dirty or damaged or when you've burned the media at a high speed. Please try cleaning the media and or burning new media at a lower speed. In the event that you continue to encounter these errors it may be an issue with your CD / DVD drive.")
6 raise StopIteration
7
8- if report['ProblemType'] != 'Bug':
9+ if report['ProblemType'] != 'Bug' and not 'Traceback' in report:
10 collect_grub = False
11 collect_trace = False
12 if not 'grub-installer: Installation finished. No error reported' in syslog and 'grub-installer:' in syslog:
13
14=== modified file 'debian/changelog'
15--- debian/changelog 2011-09-08 18:09:59 +0000
16+++ debian/changelog 2011-09-12 17:51:23 +0000
17@@ -1,3 +1,10 @@
18+apport (1.22.1-0ubuntu3) oneiric; urgency=low
19+
20+ * data/package-hooks/source_ubiquity.py: Do not create a DuplicateSignature
21+ for bugs with a Traceback included as it is redundant
22+
23+ -- Brian Murray <brian@ubuntu.com> Mon, 12 Sep 2011 10:02:45 -0700
24+
25 apport (1.22.1-0ubuntu2) oneiric; urgency=low
26
27 * data/general-hooks/ubuntu.py: include apport version in bug reports since

Subscribers

People subscribed via source and target branches