Merge lp:~brian-murray/apport/add-apport-version into lp:~ubuntu-core-dev/ubuntu/oneiric/apport/ubuntu

Proposed by Brian Murray on 2011-09-08
Status: Merged
Merged at revision: 1840
Proposed branch: lp:~brian-murray/apport/add-apport-version
Merge into: lp:~ubuntu-core-dev/ubuntu/oneiric/apport/ubuntu
Diff against target: 27 lines (+9/-0)
2 files modified
data/general-hooks/ubuntu.py (+2/-0)
debian/changelog (+7/-0)
To merge this branch: bzr merge lp:~brian-murray/apport/add-apport-version
Reviewer Review Type Date Requested Status
Martin Pitt 2011-09-08 Approve on 2011-09-08
Review via email: mp+74659@code.launchpad.net
To post a comment you must log in.
Martin Pitt (pitti) wrote :

Looks fine, 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-09-01 10:10:53 +0000
3+++ data/general-hooks/ubuntu.py 2011-09-08 17:59:17 +0000
4@@ -25,6 +25,8 @@
5
6 add_cloud_info(report)
7
8+ report['ApportVersion'] = apport.packaging.get_version('apport')
9+
10 if report.get('ProblemType') == 'Package':
11 check_for_disk_error(report)
12
13
14=== modified file 'debian/changelog'
15--- debian/changelog 2011-09-06 06:16:49 +0000
16+++ debian/changelog 2011-09-08 17:59:17 +0000
17@@ -1,3 +1,10 @@
18+apport (1.22.1-0ubuntu2) oneiric; urgency=low
19+
20+ * data/general-hooks/ubuntu.py: include apport version in bug reports since
21+ apport contains code for blocking bug reports and source package hooks
22+
23+ -- Brian Murray <brian@ubuntu.com> Thu, 08 Sep 2011 09:17:12 -0700
24+
25 apport (1.22.1-0ubuntu1) oneiric; urgency=low
26
27 [ Martin Pitt ]

Subscribers

People subscribed via source and target branches