Merge lp:~brian-murray/apport/disk-errors-in-current-dmesg into lp:~ubuntu-core-dev/ubuntu/oneiric/apport/ubuntu

[Brian Murray]

[Martin Pitt (pitti)]

Thanks! Merged with a small code cleanup.

review: Approve

=== modified file 'data/general-hooks/ubuntu.py'
--- data/general-hooks/ubuntu.py	2011-09-08 17:56:10 +0000
+++ data/general-hooks/ubuntu.py	2011-09-16 17:53:25 +0000
@@ -186,7 +186,9 @@
 
 def check_for_disk_error(report):
     devs_to_check = []
-    if not 'Df.txt' in report or not 'Dmesg.txt' in report:
+    if not 'Dmesg.txt' in report and not 'CurrentDmesg.txt' in report:
+        return
+    if not 'Df.txt' in report:
         return
     df = report['Df.txt']
     for line in df:
@@ -196,7 +198,10 @@
             device = line.split(' ')[0].strip('0123456789')
             device = device.replace('/dev/', '')
             devs_to_check.append(device)
-    dmesg = report['Dmesg.txt']
+    if 'CurrentDmesg.txt' in report:
+        dmesg = report['CurrentDmesg.txt']
+    elif 'Dmesg.txt' in report:
+        dmesg = report['Dmesg.txt']
     for line in dmesg:
         line = line.strip('\n')
         if 'I/O error' in line:

=== modified file 'debian/changelog'
--- debian/changelog	2011-09-14 06:29:56 +0000
+++ debian/changelog	2011-09-16 17:53:25 +0000
@@ -1,3 +1,10 @@
+apport (1.23-0ubuntu2) oneiric; urgency=low
+
+  * data/general-hooks/ubuntu.py: also check CurrentDmesg for disk errors
+    as some package hooks add it
+
+ -- Brian Murray <[e-mail]>  Fri, 16 Sep 2011 10:43:27 -0700
+
 apport (1.23-0ubuntu1) oneiric; urgency=low
 
   [ Brian Murray ]