Merge lp:~ronj/apport/betterErrorBox into lp:~apport-hackers/apport/trunk

[Ronan Jouchet]

I just refactored the condition, separated the two cases, and made the UnreportableReason a bit more explicit.

I'm kinda new, please check the flow is correct and ensure I didn't break anything about localization.

[Martin Pitt (pitti)]

This merge request was created twice. I'll use https://code.launchpad.net/~ronj/apport/betterErrorBox/+merge/23115

Thanks!

review: Disapprove

[Martin Pitt (pitti)]

Whoops, the other was already marked as superseded, sorry.

This looks fine, but will be merged after Ubuntu 10.04 release (which is currently in string freeze).

Thanks!

review: Approve

[Ronan Jouchet (ronj)]

Great!
This is one of my first patches, the first version (1760) had missing colons.
I hope you really reviewed it in detail, I'm new to Python and while I'm happy to help, I don't want to break anything...

[Martin Pitt (pitti)]

Sorry, this fell off the radar. Merged into trunk now with some corrections. Thanks!

=== modified file 'apport/ui.py'
--- apport/ui.py	2010-03-31 14:19:05 +0000
+++ apport/ui.py	2010-04-09 16:25:39 +0000
@@ -80,12 +80,15 @@
     # check package origin; we do that after adding hooks, so that hooks have
     # the chance to set a third-party CrashDB.
     try:
-        if ('Package' not in report or \
-              not apport.packaging.is_distro_package(report['Package'].split()[0])) \
-              and 'CrashDB' not in report:
-            #TRANS: %s is the name of the operating system
-            report['UnreportableReason'] = _('This is not a genuine %s package') % \
-                report['DistroRelease'].split()[0]
+        if 'CrashDB' not in report:
+            if 'Package' not in report:
+                report['UnreportableReason'] = _('This package does not seem to be installed correctly') % \
+                    report['DistroRelease'].split()[0]
+            elif not apport.packaging.is_distro_package(report['Package'].split()[0]):
+                #TRANS: %s is the name of the operating system
+                report['UnreportableReason'] = _('This package does not come from %s \
+official repositories. Please remove any PPA and try again.') % \
+                    report['DistroRelease'].split()[0]
     except ValueError:
         # this happens if we are collecting information on an uninstalled
         # package