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

[Brian Murray]

[Kees Cook (kees)]

Looks good, thanks!

review: Approve

=== modified file 'data/general-hooks/ubuntu.py'
--- data/general-hooks/ubuntu.py	2011-08-12 03:14:05 +0000
+++ data/general-hooks/ubuntu.py	2011-08-13 18:44:22 +0000
@@ -75,11 +75,11 @@
     # build a duplicate signature tag for package reports
     if report.get('ProblemType') == 'Package':
         dupe_sig = ''
-        for line in report['DpkgTerminalLog']:
+        for line in report['DpkgTerminalLog'].split('\n'):
             if line.startswith('Setting up') or line.startswith('Unpacking'):
-                dupe_sig = line
+                dupe_sig = '%s\n' % line
                 continue
-            dupe_sig += line
+            dupe_sig += '%s\n' % line
             if 'dpkg: error' in dupe_sig and line.startswith(' '):
                 if 'trying to overwrite' in line:
                     conflict_pkg = re.search('in package (.*) ', line)

=== modified file 'debian/changelog'
--- debian/changelog	2011-08-11 19:40:57 +0000
+++ debian/changelog	2011-08-13 18:44:22 +0000
@@ -1,3 +1,10 @@
+apport (1.21.2-0ubuntu14) oneiric; urgency=low
+
+  * data/general-hooks/ubuntu.py: resolve issue with the contents of
+    DuplicateSignature being truncated
+
+ -- Brian Murray <[e-mail]>  Sat, 13 Aug 2011 11:40:07 -0700
+
 apport (1.21.2-0ubuntu13) oneiric; urgency=low
 
   * data/general-hooks/ubuntu.py: do not report package installation failures