← Back to branch summary

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

« back to all changes in this revision

Viewing changes to data/general-hooks/ubuntu.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/general-hooks/ubuntu.py
186
186
 
187
187
def check_for_disk_error(report):
188
188
    devs_to_check = []
189
 
    if not 'Df.txt' in report or not 'Dmesg.txt' in report:
 
189
    if not 'Dmesg.txt' in report and not 'CurrentDmesg.txt' in report:
 
190
        return
 
191
    if not 'Df.txt' in report:
190
192
        return
191
193
    df = report['Df.txt']
192
194
    for line in df:
196
198
            device = line.split(' ')[0].strip('0123456789')
197
199
            device = device.replace('/dev/', '')
198
200
            devs_to_check.append(device)
199
 
    dmesg = report['Dmesg.txt']
 
201
    dmesg = report.get('CurrentDmesg.txt', report['Dmesg.txt'])
200
202
    for line in dmesg:
201
203
        line = line.strip('\n')
202
204
        if 'I/O error' in line: