Merge lp:~cr3/checkbox/959463 into lp:checkbox

Proposed by Marc Tardif
Status: Merged
Merged at revision: 1332
Proposed branch: lp:~cr3/checkbox/959463
Merge into: lp:checkbox
Diff against target: 36 lines (+4/-4)
2 files modified
debian/changelog (+1/-0)
plugins/apport_prompt.py (+3/-4)
To merge this branch: bzr merge lp:~cr3/checkbox/959463
Reviewer Review Type Date Requested Status
Daniel Manrique Approve
Review via email: mp+98228@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Daniel Manrique (roadmr) wrote :

Looks good, merging. Thanks!

review: Approve

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-03-19 14:53:43 +0000
3+++ debian/changelog 2012-03-19 16:34:05 +0000
4@@ -31,6 +31,7 @@
5
6 [Marc Tardif]
7 * Linted qt_interface which had a few syntax errors (LP: #949957)
8+ * Fixed apport integration was producing a trace (LP: #959463)
9
10 [Daniel Manrique]
11 * Bumpted revision number to 0.13.5 in trunk
12
13=== modified file 'plugins/apport_prompt.py'
14--- plugins/apport_prompt.py 2011-12-15 15:56:02 +0000
15+++ plugins/apport_prompt.py 2012-03-19 16:34:05 +0000
16@@ -125,7 +125,7 @@
17 self.interface.show_progress_stop()
18
19 def ui_present_report_details(self, *args):
20- return "full"
21+ return dict(report=1)
22
23 def ui_question_choice(self, text, options, multiple):
24 self.interface.show_progress_stop()
25@@ -224,9 +224,8 @@
26 return
27
28 if test.get("suite"):
29- failed_test_message = _("Test %(name)s from suite %(suite)s failed.") % {
30- 'name' : test["name"],
31- 'suite:' : test["suite"]}
32+ failed_test_message = _("Test %(name)s failed.") % {
33+ 'name' : test["name"]}
34 else:
35 failed_test_message = _("Test %s failed.") % test["name"]
36 failed_test_message += "\n" + _("Do you want to report a bug?")

Subscribers

People subscribed via source and target branches