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

[Brian Murray]

This branch adds a DuplicateSignature tag to apport-package installation failures allowing them to be marked as duplicates by the retracer. For example:

DistroRelease: Ubuntu 11.10
DuplicateSignature:
 Setting up pytrainer (1.8.0-3) ...
 dpkg: error processing pytrainer (--configure):
  subprocess installed post-installation script returned error exit status
PackageArchitecture: all

I've tested this by installing the ubuntu general hook and creating a package installation failure as seen above. Additionally, I've written code to do the same thing and produced DuplicateSignatures for a collection of DpkgTerminalLog files which I have locally and it works well.

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

1813. By Brian Murray on 2011-08-10

don't create a duplicate signature for post-installation failures

[Steve Langasek (vorlon)]

It's redundant to check for "Setting up" in the log if we're going to exclude anything matching a "post-installation script returned error", since these two lines will always go hand-in-hand in a dpkg failure.

review: Needs Fixing

[Steve Langasek (vorlon)]

after discussing, have merged the last-but-one revision from this branch.

=== modified file 'data/general-hooks/ubuntu.py'
--- data/general-hooks/ubuntu.py	2011-07-22 14:51:08 +0000
+++ data/general-hooks/ubuntu.py	2011-08-10 16:48:35 +0000
@@ -72,6 +72,24 @@
         if package:
             attach_upstart_overrides(report, package)
 
+    # build a duplicate signature tag for package reports
+    if report.get('ProblemType') == 'Package':
+        dupe_sig = ''
+        for line in report['DpkgTerminalLog']:
+            if line.startswith('Setting up') or line.startswith('Unpacking'):
+                dupe_sig = line
+                continue
+            dupe_sig += line
+            if 'dpkg: error' in dupe_sig and line.startswith(' '):
+                if 'trying to overwrite' in line:
+                   report['Tags'] += 'package-conflict'
+                elif 'post-installation script returned error' in line:
+                    break
+                if 'Setting up' in dupe_sig or 'Unpacking' in dupe_sig:
+                    report['DuplicateSignature'] = dupe_sig
+                    # the duplicate signature should be the first failure
+                    break
+
     # running Unity?
     username = pwd.getpwuid(os.geteuid()).pw_name
     if subprocess.call(['killall', '-s0', '-u', username,
 
=== modified file 'debian/changelog'
--- debian/changelog	2011-08-04 18:57:17 +0000
+++ debian/changelog	2011-08-10 16:48:35 +0000
@@ -1,3 +1,12 @@
+apport (1.21.2-0ubuntu11) oneiric; urgency=low
+
+  * data/general-hooks/ubuntu.py:
+    - create a duplicate signature for package installation failures
+    - tag install failures due to a package conflict 'package-conflict'
+      (LP: #368435)
+
+ -- Brian Murray <[e-mail]>  Wed, 10 Aug 2011 09:02:04 -0700
+
 apport (1.21.2-0ubuntu10) oneiric; urgency=low
 
   * data/package-hooks/source_debian-installer.py: