Ubuntu
unity package

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

  1. Quantal (12.10)
  2. lp1013171
  3. Merge into quantal
Proposed by Matthieu Baerts
Status: Merged
Merged at revision: 720
Proposed branch: lp:~matttbe/ubuntu/quantal/unity/lp1013171
Merge into: lp:ubuntu/quantal/unity
Diff against target: 40 lines (+7/-2)
2 files modified
debian/changelog (+5/-1)
debian/source_unity.py (+2/-1)
To merge this branch: bzr merge lp:~matttbe/ubuntu/quantal/unity/lp1013171
Reviewer Review Type Date Requested Status
Didier Roche-Tolomelli Approve
Review via email: mp+113032@code.launchpad.net

Description of the change

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

To post a comment you must log in.
Revision history for this message
Didier Roche-Tolomelli (didrocks) wrote :

excellent, pulling and pushing! thanks :)

review: Approve
Revision history for this message
Matthieu Baerts (matttbe) wrote :

4 minutes to merge a simple branch, impressive :)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2012-07-02 11:40:04 +0000
3+++ debian/changelog 2012-07-02 13:07:25 +0000
4@@ -1,12 +1,16 @@
5 unity (5.12-0ubuntu5) UNRELEASED; urgency=low
6
7+ [ Didier Roche ]
8 * debian/rules, debian/control, debian/unity-autopilot.install:
9 - install new unity-autopilot package, containing autopilot bindings and
10 test for Unity
11 - use dh_python2 and add some python:Depends dep for automatic python
12 version detection
13
14- -- Didier Roche <didrocks@ubuntu.com> Mon, 02 Jul 2012 13:33:54 +0200
15+ [ Matthieu Baerts (matttbe) ]
16+ * Update apport hook for python3 ; thanks to Edward Donovan (LP: #1013171)
17+
18+ -- Matthieu Baerts (matttbe) <matttbe@gmail.com> Mon, 02 Jul 2012 14:56:18 +0200
19
20 unity (5.12-0ubuntu4) quantal-proposed; urgency=low
21
22
23=== modified file 'debian/source_unity.py'
24--- debian/source_unity.py 2012-02-14 12:14:25 +0000
25+++ debian/source_unity.py 2012-07-02 13:07:25 +0000
26@@ -1,4 +1,5 @@
27 import apport.packaging
28+from apport.hookutils import *
29
30 def add_info(report, ui):
31
32@@ -14,7 +15,7 @@
33 report['Tags'] += " rc-%s" % version
34
35 # the crash is not in the unity code so reassign
36- if report.has_key("Stacktrace") and "/usr/lib/indicators" in report["Stacktrace"]:
37+ if "Stacktrace" in report and "/usr/lib/indicators" in report["Stacktrace"]:
38 for words in report["Stacktrace"].split():
39 if words.startswith("/usr/lib/indicators"):
40 report.add_package_info(apport.packaging.get_file_package(words))

Subscribers

People subscribed via source and target branches