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

Proposed by Brian Murray on 2011-08-13
Status: Merged
Merged at revision: 1815
Proposed branch: lp:~brian-murray/ubuntu/oneiric/apport/fix-pkg-dupe-sig
Merge into: lp:~ubuntu-core-dev/ubuntu/oneiric/apport/ubuntu
Diff against target: 33 lines (+10/-3)
2 files modified
data/general-hooks/ubuntu.py (+3/-3)
debian/changelog (+7/-0)
To merge this branch: bzr merge lp:~brian-murray/ubuntu/oneiric/apport/fix-pkg-dupe-sig
Reviewer Review Type Date Requested Status
Kees Cook 2011-08-13 Approve on 2011-08-14
Review via email: mp+71460@code.launchpad.net
To post a comment you must log in.
Kees Cook (kees) wrote :

Looks good, thanks!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'data/general-hooks/ubuntu.py'
2--- data/general-hooks/ubuntu.py 2011-08-12 03:14:05 +0000
3+++ data/general-hooks/ubuntu.py 2011-08-13 18:44:22 +0000
4@@ -75,11 +75,11 @@
5 # build a duplicate signature tag for package reports
6 if report.get('ProblemType') == 'Package':
7 dupe_sig = ''
8- for line in report['DpkgTerminalLog']:
9+ for line in report['DpkgTerminalLog'].split('\n'):
10 if line.startswith('Setting up') or line.startswith('Unpacking'):
11- dupe_sig = line
12+ dupe_sig = '%s\n' % line
13 continue
14- dupe_sig += line
15+ dupe_sig += '%s\n' % line
16 if 'dpkg: error' in dupe_sig and line.startswith(' '):
17 if 'trying to overwrite' in line:
18 conflict_pkg = re.search('in package (.*) ', line)
19
20=== modified file 'debian/changelog'
21--- debian/changelog 2011-08-11 19:40:57 +0000
22+++ debian/changelog 2011-08-13 18:44:22 +0000
23@@ -1,3 +1,10 @@
24+apport (1.21.2-0ubuntu14) oneiric; urgency=low
25+
26+ * data/general-hooks/ubuntu.py: resolve issue with the contents of
27+ DuplicateSignature being truncated
28+
29+ -- Brian Murray <brian@ubuntu.com> Sat, 13 Aug 2011 11:40:07 -0700
30+
31 apport (1.21.2-0ubuntu13) oneiric; urgency=low
32
33 * data/general-hooks/ubuntu.py: do not report package installation failures

Subscribers

People subscribed via source and target branches