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

[Brian Murray]

[Martin Pitt (pitti)]

Thanks!

review: Approve

=== modified file 'data/package-hooks/source_ubiquity.py'
--- data/package-hooks/source_ubiquity.py	2011-09-01 10:17:41 +0000
+++ data/package-hooks/source_ubiquity.py	2011-09-12 17:51:23 +0000
@@ -66,7 +66,7 @@
         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
 
-    if report['ProblemType'] != 'Bug':
+    if report['ProblemType'] != 'Bug' and not 'Traceback' in report:
         collect_grub = False
         collect_trace = False
         if not 'grub-installer: Installation finished. No error reported' in syslog and 'grub-installer:' in syslog:

=== modified file 'debian/changelog'
--- debian/changelog	2011-09-08 18:09:59 +0000
+++ debian/changelog	2011-09-12 17:51:23 +0000
@@ -1,3 +1,10 @@
+apport (1.22.1-0ubuntu3) oneiric; urgency=low
+
+  * data/package-hooks/source_ubiquity.py: Do not create a DuplicateSignature
+    for bugs with a Traceback included as it is redundant
+
+ -- Brian Murray <[e-mail]>  Mon, 12 Sep 2011 10:02:45 -0700
+
 apport (1.22.1-0ubuntu2) oneiric; urgency=low
 
   * data/general-hooks/ubuntu.py: include apport version in bug reports since