Apport

Merge lp:~brian-murray/apport/ubiquity-hook into lp:~ubuntu-core-dev/ubuntu/oneiric/apport/ubuntu

  1. ubiquity-hook
  2. Merge into ubuntu
Proposed by Brian Murray
Status: Merged
Merged at revision: 1793
Proposed branch: lp:~brian-murray/apport/ubiquity-hook
Merge into: lp:~ubuntu-core-dev/ubuntu/oneiric/apport/ubuntu
Diff against target: 50 lines (+19/-3)
2 files modified
data/package-hooks/source_ubiquity.py (+11/-3)
debian/changelog (+8/-0)
To merge this branch: bzr merge lp:~brian-murray/apport/ubiquity-hook
Reviewer Review Type Date Requested Status
Ubuntu Core Development Team Pending
Review via email: mp+67254@code.launchpad.net
To post a comment you must log in.
lp:~brian-murray/apport/ubiquity-hook updated
1794. By Brian Murray

minor modifications based on reviewer feedback

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'data/package-hooks/source_ubiquity.py'
2--- data/package-hooks/source_ubiquity.py 2011-03-31 14:02:55 +0000
3+++ data/package-hooks/source_ubiquity.py 2011-07-07 21:07:26 +0000
4@@ -1,7 +1,8 @@
5 '''Apport package hook for the ubiquity live CD installer.
6
7 Copyright (C) 2009 Canonical Ltd.
8-Author: Colin Watson <cjwatson@ubuntu.com>'''
9+Authors: Colin Watson <cjwatson@ubuntu.com>,
10+ Brian Murray <brian@ubuntu.com>'''
11
12 import os.path
13 import apport.hookutils
14@@ -20,11 +21,18 @@
15 apport.hookutils.attach_root_command_outputs(report,
16 {ident: "cat '%s'" % f})
17
18-def add_info(report):
19+def add_info(report, ui):
20 add_installation_log(report, 'UbiquitySyslog', 'syslog')
21+ if 'SQUASHFS error: Unable to read' in report['UbiquitySyslog']:
22+ ui.information("The system log from your installation contains an error. The specific error commonly occurs when there is an issue with the media from which you were installing. This can happen when your media is dirty or damaged or when you've burned the media at a high speed. Please try cleaning the media and or burning new media at a lower speed. In the event that you continue to encounter these errors it may be an issue with your CD / DVD drive.")
23+ raise StopIteration
24 add_installation_log(report, 'UbiquityPartman', 'partman')
25 if os.path.exists('/var/log/installer/debug'):
26- report['UbiquityDebug'] = ('/var/log/installer/debug',)
27+ response = ui.yesno("The debug log file from your installation would help us a lot but includes the password you used for your user when installing Ubuntu. Do you want to include this log file?")
28+ if response is None:
29+ raise StopIteration
30+ if response:
31+ add_installation_log(report, 'UbiquityDebug', 'debug')
32 if os.path.exists('/var/log/installer/dm'):
33 report['UbiquityDm'] = ('/var/log/installer/dm',)
34 add_installation_log(report, 'Casper', 'casper.log')
35
36=== modified file 'debian/changelog'
37--- debian/changelog 2011-07-01 15:35:49 +0000
38+++ debian/changelog 2011-07-07 21:07:26 +0000
39@@ -1,3 +1,11 @@
40+apport (1.21.2-0ubuntu2) oneiric; urgency=low
41+
42+ * data/package-hooks/source_ubiquity.py:
43+ - Check syslog for squashfs errors and do not report
44+ - Ask before adding installer debug log file (LP: #773766)
45+
46+ -- Brian Murray <brian@ubuntu.com> Thu, 07 Jul 2011 13:40:17 -0700
47+
48 apport (1.21.2-0ubuntu1) oneiric; urgency=low
49
50 * New upstream bug fix release. Changes since our trunk snapshot:

Subscribers

People subscribed via source and target branches