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

Proposed by Brian Murray on 2011-08-20
Status: Merged
Merged at revision: 1825
Proposed branch: lp:~brian-murray/ubuntu/oneiric/apport/dist-upgrade-dupe-sig
Merge into: lp:~ubuntu-core-dev/ubuntu/oneiric/apport/ubuntu
Diff against target: 36 lines (+15/-2)
2 files modified
data/general-hooks/ubuntu.py (+8/-2)
debian/changelog (+7/-0)
To merge this branch: bzr merge lp:~brian-murray/ubuntu/oneiric/apport/dist-upgrade-dupe-sig
Reviewer Review Type Date Requested Status
Martin Pitt 2011-08-20 Approve on 2011-08-22
Ubuntu Core Development Team 2011-08-20 Pending
Review via email: mp+72286@code.launchpad.net

Description of the change

Distribution upgrades aren't having a DuplicateSignature created for package installation failures. This resolves that issue.

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/general-hooks/ubuntu.py'
2--- data/general-hooks/ubuntu.py 2011-08-17 06:40:18 +0000
3+++ data/general-hooks/ubuntu.py 2011-08-20 06:33:23 +0000
4@@ -73,9 +73,15 @@
5 attach_upstart_overrides(report, package)
6
7 # build a duplicate signature tag for package reports
8- if report.get('ProblemType') == 'Package' and 'DpkgTerminalLog' in report:
9+ if report.get('ProblemType') == 'Package':
10+ if 'DpkgTerminalLog' in report:
11+ termlog = report['DpkgTerminalLog']
12+ elif 'VarLogDistupgradeApttermlog' in report:
13+ termlog = report['VarLogDistupgradeApttermlog']
14+ else:
15+ break
16 dupe_sig = ''
17- for line in report['DpkgTerminalLog'].split('\n'):
18+ for line in termlog.split('\n'):
19 if line.startswith('Setting up') or line.startswith('Unpacking'):
20 dupe_sig = '%s\n' % line
21 continue
22
23=== modified file 'debian/changelog'
24--- debian/changelog 2011-08-17 14:35:45 +0000
25+++ debian/changelog 2011-08-20 06:33:23 +0000
26@@ -1,3 +1,10 @@
27+apport (1.21.3-0ubuntu5) oneiric; urgency=low
28+
29+ * data/general-hooks/ubuntu.py: generate a DuplicateSignature tag for
30+ distribution upgrades too
31+
32+ -- Brian Murray <brian@ubuntu.com> Fri, 19 Aug 2011 23:27:58 -0700
33+
34 apport (1.21.3-0ubuntu4) oneiric; urgency=low
35
36 * data/package-hooks/source_ubiquity.py: remove use of continue when not in

Subscribers

People subscribed via source and target branches