Merge lp:~matttbe/ubuntu/quantal/unity/lp1013171 into lp:ubuntu/quantal/unity

[Matthieu Baerts]

Hello Didier,

This is just a patch to update apport hook for python3.
I set you as reviewer because you're the latest commiter on the main branch and the version is still 'UNRELEASED' but I can add ubuntu-sponsors team if you want ;)

Have a nice day,

Matt

[Didier Roche-Tolomelli (didrocks)]

excellent, pulling and pushing! thanks :)

review: Approve

[Matthieu Baerts (matttbe)]

4 minutes to merge a simple branch, impressive :)

=== modified file 'debian/changelog'
--- debian/changelog	2012-07-02 11:40:04 +0000
+++ debian/changelog	2012-07-02 13:07:25 +0000
@@ -1,12 +1,16 @@
 unity (5.12-0ubuntu5) UNRELEASED; urgency=low
 
+  [ Didier Roche ]
   * debian/rules, debian/control, debian/unity-autopilot.install:
     - install new unity-autopilot package, containing autopilot bindings and
       test for Unity
     - use dh_python2 and add some python:Depends dep for automatic python
       version detection
 
- -- Didier Roche <[e-mail]>  Mon, 02 Jul 2012 13:33:54 +0200
+  [ Matthieu Baerts (matttbe) ]
+  * Update apport hook for python3 ; thanks to Edward Donovan (LP: #1013171)
+
+ -- Matthieu Baerts (matttbe) <[e-mail]>  Mon, 02 Jul 2012 14:56:18 +0200
 
 unity (5.12-0ubuntu4) quantal-proposed; urgency=low
 
 
=== modified file 'debian/source_unity.py'
--- debian/source_unity.py	2012-02-14 12:14:25 +0000
+++ debian/source_unity.py	2012-07-02 13:07:25 +0000
@@ -1,4 +1,5 @@
 import apport.packaging
+from apport.hookutils import *
 
 def add_info(report, ui):
 
@@ -14,7 +15,7 @@
         report['Tags'] += " rc-%s" % version
     
     # the crash is not in the unity code so reassign
-    if report.has_key("Stacktrace") and "/usr/lib/indicators" in report["Stacktrace"]:
+    if "Stacktrace" in report and "/usr/lib/indicators" in report["Stacktrace"]:
         for words in report["Stacktrace"].split():
             if words.startswith("/usr/lib/indicators"):
                 report.add_package_info(apport.packaging.get_file_package(words))