Merge lp:~brian-murray/ubuntu/oneiric/apport/unreportable-pkg-conflict into lp:~ubuntu-core-dev/ubuntu/oneiric/apport/ubuntu

[Brian Murray]

From the better apport package bug reports blue print:

[brian-murray] parse conflicting package out of log, refuse bug filing if that isn't an Ubuntu package: TODO

[Kees Cook (kees)]

conflict_pkg is a Match object. You probably want, for line 10:

if conflict_pkg and not apport.packaging.is_distro_package(conflict_pkg.group(1)):

review: Needs Fixing

[lp:~brian-murray/ubuntu/oneiric/apport/unreportable-pkg-conflict]

1815. By Brian Murray on 2011-08-12

fix logic error

1816. By Brian Murray on 2011-08-12

use the add_tag function for adding package-conflict as a tag

[Kees Cook (kees)]

Looks great to me, thanks!

review: Approve

=== modified file 'data/general-hooks/ubuntu.py'
--- data/general-hooks/ubuntu.py	2011-08-10 16:09:33 +0000
+++ data/general-hooks/ubuntu.py	2011-08-12 03:16:22 +0000
@@ -82,7 +82,10 @@
             dupe_sig += line
             if 'dpkg: error' in dupe_sig and line.startswith(' '):
                 if 'trying to overwrite' in line:
-                   report['Tags'] += 'package-conflict'
+                    conflict_pkg = re.search('in package (.*) ', line)
+                    if conflict_pkg and not apport.packaging.is_distro_package(conflict_pkg.group(1)):
+                        report['UnreportableReason'] = _('An Ubuntu package has a file conflict with a package that is not a genuine Ubuntu package')
+                    add_tag(report, 'package-conflict')
                 if 'Setting up' in dupe_sig or 'Unpacking' in dupe_sig:
                     report['DuplicateSignature'] = dupe_sig
                     # the duplicate signature should be the first failure

=== modified file 'debian/changelog'
--- debian/changelog	2011-08-10 18:02:08 +0000
+++ debian/changelog	2011-08-12 03:16:22 +0000
@@ -1,3 +1,10 @@
+apport (1.21.2-0ubuntu13) oneiric; urgency=low
+
+  * data/general-hooks/ubuntu.py: do not report package installation failures
+    where the conflicting package is not a genuine Ubuntu package
+
+ -- Brian Murray <[e-mail]>  Thu, 11 Aug 2011 12:40:11 -0700
+
 apport (1.21.2-0ubuntu12) oneiric; urgency=low
 
   * Merge change from trunk: