Merge lp:~brian-murray/ubuntu/oneiric/apport/ubiquity-dupe-sig into lp:~ubuntu-core-dev/ubuntu/oneiric/apport/ubuntu

[Brian Murray]

This branch creates a DuplicateSignature for ubiquity bug reports using information in syslog and if there is an error with grub-installer changes the source package to grub-installer. This is testable by modifying your '/var/log/installer/syslog' file to include grub-installer messages or add in a Traceback.

I personally have tested it with a syslog including grub-installer messages and saw the source package changed. I also used a syslog with just a Traceback and verified the contents of the DuplicateSignature. Finally I used a syslog with no Traceback or grub-installer messages and saw no DuplicateSignature. I'd really like to get this merged as soon as possible.

[Martin Pitt (pitti)]

Brian, it seems something went wrong with pushing your branch? There's no diff.

[lp:~brian-murray/ubuntu/oneiric/apport/ubiquity-dupe-sig]

1830. By Brian Murray on 2011-08-26

data/package-hooks/source_ubiquity.py: create a duplicate signature for
ubiquity bug reports using data in syslog

[Brian Murray (brian-murray)]

I've updated the branch.

=== modified file 'data/package-hooks/source_ubiquity.py'
--- data/package-hooks/source_ubiquity.py	2011-08-17 14:35:45 +0000
+++ data/package-hooks/source_ubiquity.py	2011-08-26 13:44:54 +0000
@@ -22,6 +22,35 @@
         apport.hookutils.attach_root_command_outputs(report,
             {ident: "cat '%s'" % f})
 
+
+def prepare_duplicate_signature(syslog, collect_grub, collect_trace):
+    collect = ''
+    for line in syslog.split('\n'):
+        if collect_grub:
+            if 'grub-installer:' in line and collect == "":
+                collect = ' '.join(line.split(' ')[4:]) + '\n'
+                continue
+            elif 'grub-installer:' in line and collect != "":
+                collect += ' '.join(line.split(' ')[4:]) + '\n'
+                continue
+        if not collect_trace and collect != '':
+            return collect
+        if 'Traceback (most recent call last):' in line and \
+                collect_grub:
+            collect += ' '.join(line.split(' ')[5:]) + '\n'
+            continue
+        if 'Traceback (most recent call last):' in line and \
+                not collect_grub:
+            collect = ' '.join(line.split(' ')[5:]) + '\n'
+            continue
+        if len(line.split(' ')[5:]) == 1 and 'Traceback' in collect:
+            if collect != '':
+                return collect
+        if not 'Traceback' in collect:
+            continue
+        collect += ' '.join(line.split(' ')[5:]) + '\n'
+
+
 def add_info(report, ui):
     add_installation_log(report, 'UbiquitySyslog', 'syslog')
     syslog = report['UbiquitySyslog']
@@ -37,6 +66,19 @@
         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
 
+    collect_grub = False
+    collect_trace = False
+    if not 'grub-installer: Installation finished. No error reported' in syslog and 'grub-installer:' in syslog:
+        collect_grub = True
+    if 'Traceback' in syslog:
+        collect_trace = True
+    if collect_grub or collect_trace:
+        duplicate_signature = prepare_duplicate_signature(syslog,
+            collect_grub, collect_trace)
+        report['DuplicateSignature'] = duplicate_signature
+    if collect_grub:
+        report['SourcePackage'] = 'grub-installer'
+
     match = re.search('ubiquity.*Ubiquity (.*)\n', report['UbiquitySyslog'])
     if match:
         match = match.group(1)
 
=== modified file 'debian/changelog'
--- debian/changelog	2011-08-25 14:31:41 +0000
+++ debian/changelog	2011-08-26 13:44:54 +0000
@@ -1,3 +1,10 @@
+apport (1.22-0ubuntu2) oneiric; urgency=low
+
+  * data/package-hooks/source_ubiquity.py: create a duplicate signature for
+    ubiquity bug reports using data in syslog
+
+ -- Brian Murray <[e-mail]>  Thu, 25 Aug 2011 17:40:24 -0700
+
 apport (1.22-0ubuntu1) oneiric; urgency=low
 
   [ Brian Murray ]