Merge lp:~brian-murray/ubuntu/oneiric/apport/bug-856826 into lp:~ubuntu-core-dev/ubuntu/oneiric/apport/ubuntu

Proposed by Brian Murray on 2011-09-26
Status: Merged
Merged at revision: 1849
Proposed branch: lp:~brian-murray/ubuntu/oneiric/apport/bug-856826
Merge into: lp:~ubuntu-core-dev/ubuntu/oneiric/apport/ubuntu
Diff against target: 33 lines (+7/-4)
2 files modified
data/package-hooks/source_debian-installer.py (+4/-3)
debian/changelog (+3/-1)
To merge this branch: bzr merge lp:~brian-murray/ubuntu/oneiric/apport/bug-856826
Reviewer Review Type Date Requested Status
Martin Pitt 2011-09-26 Approve on 2011-09-28
Ubuntu Core Development Team 2011-09-26 Pending
Review via email: mp+77022@code.launchpad.net

Description of the change

This resolves and issue where intended log files are not gathered by the debian-installer apport package hook.

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

Thanks, looks fine!

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_debian-installer.py'
2--- data/package-hooks/source_debian-installer.py 2011-08-04 18:57:17 +0000
3+++ data/package-hooks/source_debian-installer.py 2011-09-26 17:10:27 +0000
4@@ -30,10 +30,11 @@
5 report['MemoryUsage'] = command_output(['free'])
6
7 if command_available('dmraid'):
8- report['DmraidSets'] = command_output(['dmraid', '-s'])
9- report['DmraidDevices'] = command_output(['dmraid', '-r'])
10+ attach_root_command_outputs(report, {'DmraidSets': 'dmraid -s',
11+ 'DmraidDevices': 'dmraid -r'})
12 if command_available('dmsetup'):
13- report['DeviceMapperTables'] = command_output(['dmsetup', 'table'])
14+ attach_root_command_outputs(report,
15+ {'DeviceMapperTables': 'dmsetup table'})
16
17 try:
18 installer_version = open('/var/log/installer/version')
19
20=== modified file 'debian/changelog'
21--- debian/changelog 2011-09-19 09:58:03 +0000
22+++ debian/changelog 2011-09-26 17:10:27 +0000
23@@ -8,8 +8,10 @@
24 [ Brian Murray ]
25 * data/general-hooks/ubuntu.py: also check CurrentDmesg for disk errors
26 as some package hooks add it
27+ * data/package-hooks/source_debian-installer.py: for dmraid collection use
28+ attach_root_command_outputs (LP: #856826)
29
30- -- Martin Pitt <martin.pitt@ubuntu.com> Mon, 19 Sep 2011 09:59:29 +0200
31+ -- Brian Murray <brian@ubuntu.com> Mon, 26 Sep 2011 10:00:59 -0700
32
33 apport (1.23-0ubuntu1) oneiric; urgency=low
34

Subscribers

People subscribed via source and target branches