Merge lp:~brian-murray/ubuntu/oneiric/apport/further-grub-handling into lp:~ubuntu-core-dev/ubuntu/oneiric/apport/ubuntu

[Brian Murray]

The match_error_messages function of the ubuntu general hook wasn't checking VarLogDistupgradeApttermlog at all which seemed like something worth fixing to me since dist-upgrades are likely to run into the same issues. The easiest way to check multiple files seemed to me to be creating a new function, check_attachment_for_errors, which would be passed a report and an attachment to search.

I also modified some of the grub_errors based off a discussion with cjwatson.

[Martin Pitt (pitti)]

Thanks!

review: Approve

=== modified file 'data/general-hooks/ubuntu.py'
--- data/general-hooks/ubuntu.py	2011-07-19 05:19:31 +0000
+++ data/general-hooks/ubuntu.py	2011-07-19 20:18:34 +0000
@@ -1,7 +1,8 @@
 '''Attach generally useful information, not specific to any package.
 
 Copyright (C) 2009 Canonical Ltd.
-Author: Matt Zimmerman <[e-mail]>
+Authors: Matt Zimmerman <[e-mail]>,
+         Brian Murray <[e-mail]>
 
 This program is free software; you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
@@ -17,6 +18,7 @@
 from apport.hookutils import *
 from apport import unicode_gettext as _
 
+
 def add_info(report):
     add_release_info(report)
 
@@ -26,6 +28,10 @@
 
     match_error_messages(report)
 
+    for log in ['DpkgTerminalLog', 'VarLogDistupgradeApttermlog']:
+        if log in report:
+            check_attachment_for_errors(report, log)
+
     wrong_grub_msg = _('''Your system was initially configured with grub version 2, but you have removed it from your system in favor of grub 1 without configuring it.  To ensure your bootloader configuration is updated whenever a new kernel is available, open a terminal and run:
 
   sudo apt-get install grub-pc
@@ -69,24 +75,34 @@
         stderr=subprocess.STDOUT) == 0:
         add_tag(report, 'running-unity')
 
+
 def match_error_messages(report):
     # There are enough of these now that it is probably worth refactoring...
     # -mdz
     if report['ProblemType'] == 'Package':
+        if 'failed to install/upgrade: corrupted filesystem tarfile' in report.get('Title', ''):
+            report['UnreportableReason'] = 'This failure was caused by a corrupted package download or file system corruption.'
+
+        if 'is already installed and configured' in report.get('ErrorMessage', ''):
+            report['SourcePackage'] = 'dpkg'
+
+
+def check_attachment_for_errors(report, attachment):
+    if report['ProblemType'] == 'Package':
         trim_dpkg_log(report)
 
         if report['Package'] not in ['grub', 'grub2']:
             # linux-image postinst emits this when update-grub fails
             # https://wiki.ubuntu.com/KernelTeam/DebuggingUpdateErrors
             grub_errors = [r'^User postinst hook script \[.*update-grub\] exited with value',
-                r'^run-parts: /etc/kernel/postinst.d/zz-update-grub exited with return code [1-9]+',
+                r'^run-parts: /etc/kernel/post(inst|rm).d/zz-update-grub exited with return code [1-9]+',
                 r'^/usr/sbin/grub-probe: error']
 
             for grub_error in grub_errors:
-                if 'DpkgTerminalLog' in report and re.search(grub_error, report['DpkgTerminalLog'], re.MULTILINE):
+                if attachment in report and re.search(grub_error, report[attachment], 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':
+                    if grub_package is None or grub_package == 'grub' and not 'grub-probe' in report[attachment]:
                         report['SourcePackage'] = 'grub'
                         if os.path.exists('/boot/grub/grub.cfg') \
                            and grub_hook_failure:
@@ -97,7 +113,7 @@
         if report['Package'] != 'initramfs-tools':
             # update-initramfs emits this when it fails, usually invoked from the linux-image postinst
             # https://wiki.ubuntu.com/KernelTeam/DebuggingUpdateErrors
-            if 'DpkgTerminalLog' in report and re.search(r'^update-initramfs: failed for ', report['DpkgTerminalLog'], re.MULTILINE):
+            if attachment in report and re.search(r'^update-initramfs: failed for ', report[attachment], re.MULTILINE):
                 # File these reports on the initramfs-tools package instead
                 report['SourcePackage'] = 'initramfs-tools'
 
@@ -106,16 +122,16 @@
             # we are very interested in reading the compilation log to determine
             # where to reassign this report to
             regex = r'^!! Byte-compilation for x?emacs\S+ failed!'
-            if 'DpkgTerminalLog' in report and re.search(regex, report['DpkgTerminalLog'], re.MULTILINE):
-                for line in report['DpkgTerminalLog'].split('\n'):
+            if attachment in report and re.search(regex, report[attachment], re.MULTILINE):
+                for line in report[attachment].split('\n'):
                     m = re.search(r'^!! and attach the file (\S+)', line)
                     if m:
                         path = m.group(1)
                         attach_file_if_exists(report, path)
-                        
-        if report['Package'].startswith('linux-image-') and 'DpkgTerminalLog' in report:
+
+        if report['Package'].startswith('linux-image-') and attachment in report:
             # /etc/kernel/*.d failures from kernel package postinst
-            m = re.search(r'^run-parts: (/etc/kernel/\S+\.d/\S+) exited with return code \d+', report['DpkgTerminalLog'], re.MULTILINE)
+            m = re.search(r'^run-parts: (/etc/kernel/\S+\.d/\S+) exited with return code \d+', report[attachment], re.MULTILINE)
             if m:
                 path = m.group(1)
                 package = apport.packaging.get_file_package(path)
@@ -127,16 +143,12 @@
                 else:
                     report['UnreportableReason'] = 'This failure was caused by a program which did not originate from Ubuntu'
 
-        if 'failed to install/upgrade: corrupted filesystem tarfile' in report.get('Title', ''):
-            report['UnreportableReason'] = 'This failure was caused by a corrupted package download or file system corruption.'
-
-        if 'is already installed and configured' in report.get('ErrorMessage', ''):
-            report['SourcePackage'] = 'dpkg'
 
 def add_kernel_info(report):
     # This includes the Ubuntu packaged kernel version
     attach_file_if_exists(report, '/proc/version_signature', 'ProcVersionSignature')
 
+
 def add_release_info(report):
     # https://bugs.launchpad.net/bugs/364649
     attach_file_if_exists(report, '/var/log/installer/media-info',
@@ -169,6 +181,7 @@
     else:
         report['UpgradeStatus'] = 'No upgrade log present (probably fresh install)'
 
+
 def add_cloud_info(report):
     # EC2 and Ubuntu Enterprise Cloud instances
     ec2_instance = False
@@ -209,10 +222,12 @@
             cloud = 'uec'
             add_tag(report, 'uec-images')
 
+
 def add_tag(report, tag):
     report.setdefault('Tags', '')
     report['Tags'] += ' ' + tag
 
+
 def get_oem_project(report):
     '''Determine OEM project name from Distribution Channel Descriptor
     
@@ -223,6 +238,7 @@
         return dcd.split('-')[2]
     return None
 
+
 def trim_dpkg_log(report):
     '''Trim DpkgTerminalLog to the most recent installation session.'''
 

=== modified file 'debian/changelog'
--- debian/changelog	2011-07-19 05:20:10 +0000
+++ debian/changelog	2011-07-19 20:18:34 +0000
@@ -1,3 +1,12 @@
+apport (1.21.2-0ubuntu6) oneiric; urgency=low
+
+  * data/general-hooks/ubuntu.py:
+    - In addition to DpkgTerminalLog also check VarLogDistupgradeApttermllog
+      for package installation failure messages
+    - Also move postrm.d/zz-update-grub errors to grub2
+
+ -- Brian Murray <[e-mail]>  Tue, 19 Jul 2011 13:01:37 -0700
+
 apport (1.21.2-0ubuntu5) oneiric; urgency=low
 
   * data/general-hooks/ubuntu.py: