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

[Brian Murray]

Distribution upgrades aren't having a DuplicateSignature created for package installation failures. This resolves that issue.

[Martin Pitt (pitti)]

Thanks!

review: Approve

=== modified file 'data/general-hooks/ubuntu.py'
--- data/general-hooks/ubuntu.py	2011-08-17 06:40:18 +0000
+++ data/general-hooks/ubuntu.py	2011-08-20 06:33:23 +0000
@@ -73,9 +73,15 @@
             attach_upstart_overrides(report, package)
 
     # build a duplicate signature tag for package reports
-    if report.get('ProblemType') == 'Package' and 'DpkgTerminalLog' in report:
+    if report.get('ProblemType') == 'Package':
+        if 'DpkgTerminalLog' in report:
+            termlog = report['DpkgTerminalLog']
+        elif 'VarLogDistupgradeApttermlog' in report:
+            termlog = report['VarLogDistupgradeApttermlog']
+        else:
+            break
         dupe_sig = ''
-        for line in report['DpkgTerminalLog'].split('\n'):
+        for line in termlog.split('\n'):
             if line.startswith('Setting up') or line.startswith('Unpacking'):
                 dupe_sig = '%s\n' % line
                 continue

=== modified file 'debian/changelog'
--- debian/changelog	2011-08-17 14:35:45 +0000
+++ debian/changelog	2011-08-20 06:33:23 +0000
@@ -1,3 +1,10 @@
+apport (1.21.3-0ubuntu5) oneiric; urgency=low
+
+  * data/general-hooks/ubuntu.py: generate a DuplicateSignature tag for
+    distribution upgrades too
+
+ -- Brian Murray <[e-mail]>  Fri, 19 Aug 2011 23:27:58 -0700
+
 apport (1.21.3-0ubuntu4) oneiric; urgency=low
 
   * data/package-hooks/source_ubiquity.py: remove use of continue when not in