← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/apport/oneiric-proposed

« back to all changes in this revision

Viewing changes to data/package-hooks/source_debian-installer.py

  • Committer: Package Import Robot
  • Author(s): Martin Pitt, Martin Pitt, Brian Murray
  • Date: 2011-09-28 07:12:19 UTC
  • Revision ID: package-import@ubuntu.com-20110928071219-sx503th6ld01ayyw
Tags: 1.23-0ubuntu2
https://launchpad.net/bugs/851450
https://launchpad.net/bugs/856826
[ Martin Pitt ]
* debian/control: Bump GIR dependencies to ensure that we don't run this
  against older versions against gir1.2-glib-2.0, which still have a wrong
  API for markup_escape_text(). (LP: #851450)

[ 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)

Show diffs side-by-side

added added

removed removed

Lines of Context:
data/package-hooks/source_debian-installer.py
30
30
    report['MemoryUsage'] = command_output(['free'])
31
31
 
32
32
    if command_available('dmraid'):
33
 
        report['DmraidSets'] = command_output(['dmraid', '-s'])
34
 
        report['DmraidDevices'] = command_output(['dmraid', '-r'])
 
33
        attach_root_command_outputs(report, {'DmraidSets': 'dmraid -s',
 
34
            'DmraidDevices': 'dmraid -r'})
35
35
        if command_available('dmsetup'):
36
 
            report['DeviceMapperTables'] = command_output(['dmsetup', 'table'])
 
36
            attach_root_command_outputs(report,
 
37
                {'DeviceMapperTables': 'dmsetup table'})
37
38
 
38
39
    try:
39
40
        installer_version = open('/var/log/installer/version')