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

[Brian Murray]

[Martin Pitt (pitti)]

Thanks!

review: Approve

=== modified file 'data/package-hooks/source_ubiquity.py'
--- data/package-hooks/source_ubiquity.py	2011-08-04 18:57:17 +0000
+++ data/package-hooks/source_ubiquity.py	2011-08-16 13:58:22 +0000
@@ -17,14 +17,24 @@
         return
 
     if os.access(f, os.R_OK):
-        report[ident] = (f,)
-    else:
+        report[ident] = open(f, 'r').read()
+    elif os.path.exists(f):
         apport.hookutils.attach_root_command_outputs(report,
             {ident: "cat '%s'" % f})
 
 def add_info(report, ui):
     add_installation_log(report, 'UbiquitySyslog', 'syslog')
-    if 'SQUASHFS error: Unable to read' in report['UbiquitySyslog']:
+    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 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
+    if 'SQUASHFS error: Unable to read' in syslog:
         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-13 18:40:55 +0000
+++ debian/changelog	2011-08-16 13:58:22 +0000
@@ -1,3 +1,12 @@
+apport (1.21.2-0ubuntu15) oneiric; urgency=low
+
+  * data/package-hooks/source_ubiquity.py:
+    - attach the contents of syslog in the case where it is readable by the
+      user (LP: #824799)
+    - prevent reporting of bugs due to I/O error with installation media
+
+ -- Brian Murray <[e-mail]>  Tue, 16 Aug 2011 06:48:49 -0700
+
 apport (1.21.2-0ubuntu14) oneiric; urgency=low
 
   * data/general-hooks/ubuntu.py: resolve issue with the contents of