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

[Brian Murray]

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