Merge lp:~brian-murray/ubuntu/oneiric/apport/more-bugs-for-grub into lp:~ubuntu-core-dev/ubuntu/oneiric/apport/ubuntu

[Brian Murray]

The general ubuntu hook has some handling that moves package installation failures from packages to grub2, however this only checked DpkgTerminalLog.txt for one regular expression. I've extended it a bit.

Additionally, come to find out that kerneloops was a transitional package and its now split into kerneloops-daemon and kerneloops-applet. As we can see in bug 811293 most people don't have kerneloops installed so instead we should grab the version of kerneloops-daemon.

[Martin Pitt (pitti)]

Thanks! Merged with a small simplification.

review: Approve

=== modified file 'data/general-hooks/ubuntu.py'
--- data/general-hooks/ubuntu.py	2011-07-11 16:24:28 +0000
+++ data/general-hooks/ubuntu.py	2011-07-18 22:44:36 +0000
@@ -78,16 +78,21 @@
         if report['Package'] not in ['grub', 'grub2']:
             # linux-image postinst emits this when update-grub fails
             # https://wiki.ubuntu.com/KernelTeam/DebuggingUpdateErrors
-            if 'DpkgTerminalLog' in report and re.search(r'^User postinst hook script \[.*update-grub\] exited with value', report['DpkgTerminalLog'], re.MULTILINE):
-                # File these reports on the grub package instead
-                grub_package = apport.packaging.get_file_package('/usr/sbin/update-grub')
-                if grub_package is None or grub_package == 'grub':
-                    report['SourcePackage'] = 'grub'
-                    if os.path.exists('/boot/grub/grub.cfg') \
-                       and grub_hook_failure:
-                        report['UnreportableReason'] = wrong_grub_msg
-                else:
-                    report['SourcePackage'] = 'grub2'
+            grub_errors = ['^User postinst hook script \[.*update-grub\] exited with value',
+                '^run-parts: /etc/kernel/postinst.d/zz-update-grub exited with return code [1-9]+',
+                '^/usr/sbin/grub-probe: error']
+
+            for grub_error in grub_errors:
+                if 'DpkgTerminalLog' in report and re.search(r'%s' % grub_error, report['DpkgTerminalLog'], re.MULTILINE):
+                    # File these reports on the grub package instead
+                    grub_package = apport.packaging.get_file_package('/usr/sbin/update-grub')
+                    if grub_package is None or grub_package == 'grub':
+                        report['SourcePackage'] = 'grub'
+                        if os.path.exists('/boot/grub/grub.cfg') \
+                           and grub_hook_failure:
+                            report['UnreportableReason'] = wrong_grub_msg
+                    else:
+                        report['SourcePackage'] = 'grub2'
 
         if report['Package'] != 'initramfs-tools':
             # update-initramfs emits this when it fails, usually invoked from the linux-image postinst
 
=== modified file 'data/package-hooks/source_linux.py'
--- data/package-hooks/source_linux.py	2011-07-14 15:22:12 +0000
+++ data/package-hooks/source_linux.py	2011-07-18 22:44:36 +0000
@@ -66,7 +66,7 @@
     if ('Failure' in report and report['Failure'] == 'oops'
             and 'OopsText' in report and os.path.exists(SUBMIT_SCRIPT)):
         # tag kerneloopses with the version of the kerneloops package
-        attach_related_packages(report, ['kerneloops'])
+        attach_related_packages(report, ['kerneloops-daemon'])
         #it's from kerneloops, ask the user whether to submit there as well
         if ui is not None:
             summary = report['OopsText']
 
=== modified file 'debian/changelog'
--- debian/changelog	2011-07-14 16:13:57 +0000
+++ debian/changelog	2011-07-18 22:44:36 +0000
@@ -1,3 +1,14 @@
+apport (1.21.2-0ubuntu5) oneiric; urgency=low
+
+  * data/general-hooks/ubuntu.py:
+    - Check DpkgTerminalLog for more cases that indicate the bug report should
+      be filed about grub2
+  * data/package-hooks/source_linux.py:
+    - kerneloops was a transitional package we want the version of
+      kerneloops-daemon
+
+ -- Brian Murray <[e-mail]>  Mon, 18 Jul 2011 15:33:01 -0700
+
 apport (1.21.2-0ubuntu4) oneiric; urgency=low
 
   [ Brian Murray ]