Merge lp://staging/~brian-murray/ubuntu/oneiric/apport/further-grub-handling into lp://staging/~ubuntu-core-dev/ubuntu/oneiric/apport/ubuntu

Proposed by Brian Murray
Status: Merged
Merged at revision: 1801
Proposed branch: lp://staging/~brian-murray/ubuntu/oneiric/apport/further-grub-handling
Merge into: lp://staging/~ubuntu-core-dev/ubuntu/oneiric/apport/ubuntu
Diff against target: 165 lines (+40/-15)
2 files modified
data/general-hooks/ubuntu.py (+31/-15)
debian/changelog (+9/-0)
To merge this branch: bzr merge lp://staging/~brian-murray/ubuntu/oneiric/apport/further-grub-handling
Reviewer Review Type Date Requested Status
Martin Pitt Approve
Review via email: mp+68457@code.staging.launchpad.net

Description of the change

The match_error_messages function of the ubuntu general hook wasn't checking VarLogDistupgradeApttermlog at all which seemed like something worth fixing to me since dist-upgrades are likely to run into the same issues. The easiest way to check multiple files seemed to me to be creating a new function, check_attachment_for_errors, which would be passed a report and an attachment to search.

I also modified some of the grub_errors based off a discussion with cjwatson.

To post a comment you must log in.
Revision history for this message
Martin Pitt (pitti) wrote :

Thanks!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches