Checkbox

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

  1. 1075605
  2. Merge into trunk
Proposed by Marc Tardif
Status: Merged
Approved by: Daniel Manrique
Approved revision: 1809
Merged at revision: 1813
Proposed branch: lp:~cr3/checkbox/1075605
Merge into: lp:checkbox
Diff against target: 24 lines (+2/-1)
2 files modified
debian/changelog (+1/-0)
plugins/error_prompt.py (+1/-1)
To merge this branch: bzr merge lp:~cr3/checkbox/1075605
Reviewer Review Type Date Requested Status
Daniel Manrique (community) Approve
Review via email: mp+133086@code.launchpad.net

Commit message

Merged fix to bug #1075605 by cr3.

Description of the change

These changes are proposed because of a bug found while running checkbox non-interactively:

CHECKBOX_SHARE=. CHECKBOX_DATA=. ./run --log-level=error --log= configs/checkbox.ini

To post a comment you must log in.
Revision history for this message
Daniel Manrique (roadmr) wrote :

Looks OK, thanks!

review: Approve
Revision history for this message
Marc Tardif (cr3) wrote :

If this branch is still not merged after 24 minutes, should I be worried?

Revision history for this message
Daniel Manrique (roadmr) wrote :

Merged manually X-D

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-11-05 14:18:08 +0000
3+++ debian/changelog 2012-11-06 16:07:22 +0000
4@@ -56,6 +56,7 @@
5 and simplified horizontal/vertical scrolling tests.
6 * scripts/touchpad_scroll_resource, scripts/xinput_resource: Replaced
7 the touchpad_scroll_resource by reusing the xinput_resource script.
8+ * plugins/error_prompt.py: Fixed call to show_error (LP: #1075605)
9
10 [Sean Feole]
11 * [FEATURE] jobs/optical.txt.in: modified existing automation test
12
13=== modified file 'plugins/error_prompt.py'
14--- plugins/error_prompt.py 2012-10-22 20:14:22 +0000
15+++ plugins/error_prompt.py 2012-11-06 16:07:22 +0000
16@@ -29,7 +29,7 @@
17
18 def prompt_error(self, interface, primary_text, secondary_text=None,
19 detailed_text=None):
20- interface.show_error(*args)
21+ interface.show_error(primary_text, secondary_text, detailed_text)
22
23
24 factory = ErrorPrompt

Subscribers

People subscribed via source and target branches