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

[Brian Murray]

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

[Martin Pitt (pitti)]

Thanks, looks fine!

review: Approve

=== modified file 'data/package-hooks/source_debian-installer.py'
--- data/package-hooks/source_debian-installer.py	2011-08-04 18:57:17 +0000
+++ data/package-hooks/source_debian-installer.py	2011-09-26 17:10:27 +0000
@@ -30,10 +30,11 @@
     report['MemoryUsage'] = command_output(['free'])
 
     if command_available('dmraid'):
-        report['DmraidSets'] = command_output(['dmraid', '-s'])
-        report['DmraidDevices'] = command_output(['dmraid', '-r'])
+        attach_root_command_outputs(report, {'DmraidSets': 'dmraid -s',
+            'DmraidDevices': 'dmraid -r'})
         if command_available('dmsetup'):
-            report['DeviceMapperTables'] = command_output(['dmsetup', 'table'])
+            attach_root_command_outputs(report,
+                {'DeviceMapperTables': 'dmsetup table'})
 
     try:
         installer_version = open('/var/log/installer/version')
 
=== modified file 'debian/changelog'
--- debian/changelog	2011-09-19 09:58:03 +0000
+++ debian/changelog	2011-09-26 17:10:27 +0000
@@ -8,8 +8,10 @@
   [ Brian Murray ]
   * data/general-hooks/ubuntu.py: also check CurrentDmesg for disk errors
     as some package hooks add it
+  * data/package-hooks/source_debian-installer.py: for dmraid collection use
+    attach_root_command_outputs (LP: #856826)
 
- -- Martin Pitt <[e-mail]>  Mon, 19 Sep 2011 09:59:29 +0200
+ -- Brian Murray <[e-mail]>  Mon, 26 Sep 2011 10:00:59 -0700
 
 apport (1.23-0ubuntu1) oneiric; urgency=low