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

Proposed by Brian Murray on 2011-08-17
Status: Merged
Merged at revision: 1824
Proposed branch: lp:~brian-murray/ubuntu/oneiric/apport/bug-828037
Merge into: lp:~ubuntu-core-dev/ubuntu/oneiric/apport/ubuntu
Diff against target: 34 lines (+11/-5)
2 files modified
data/package-hooks/source_ubiquity.py (+4/-5)
debian/changelog (+7/-0)
To merge this branch: bzr merge lp:~brian-murray/ubuntu/oneiric/apport/bug-828037
Reviewer Review Type Date Requested Status
Ubuntu Core Development Team 2011-08-17 Pending
Review via email: mp+71901@code.launchpad.net
To post a comment you must log in.

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-08-16 13:53:56 +0000
3+++ data/package-hooks/source_ubiquity.py 2011-08-17 14:38:25 +0000
4@@ -26,11 +26,10 @@
5 add_installation_log(report, 'UbiquitySyslog', 'syslog')
6 syslog = report['UbiquitySyslog']
7 if 'Buffer I/O error on device' in syslog:
8- if not re.search('Attached .* CD-ROM (\w+)', syslog):
9- continue
10- cd_drive = re.search('Attached .* CD-ROM (\w+)', syslog).group(1)
11- cd_error = re.search('Buffer I/O error on device %s' % cd_drive,
12- syslog)
13+ if re.search('Attached .* CD-ROM (\w+)', syslog):
14+ cd_drive = re.search('Attached .* CD-ROM (\w+)', syslog).group(1)
15+ cd_error = re.search('Buffer I/O error on device %s' % cd_drive,
16+ syslog)
17 if cd_error:
18 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.")
19 raise StopIteration
20
21=== modified file 'debian/changelog'
22--- debian/changelog 2011-08-17 13:52:25 +0000
23+++ debian/changelog 2011-08-17 14:38:25 +0000
24@@ -1,3 +1,10 @@
25+apport (1.21.3-0ubuntu4) oneiric; urgency=low
26+
27+ * data/package-hooks/source_ubiquity.py: remove use of continue when not in
28+ a loop (LP: #828037)
29+
30+ -- Brian Murray <brian@ubuntu.com> Wed, 17 Aug 2011 07:34:21 -0700
31+
32 apport (1.21.3-0ubuntu3) oneiric; urgency=low
33
34 * Fix crash in GLib.markup_escape_text() call. Patch cherrypicked from

Subscribers

People subscribed via source and target branches