Merge lp:~zyga/checkbox/fix-1092925 into lp:checkbox

Proposed by Zygmunt Krynicki
Status: Merged
Approved by: Daniel Manrique
Approved revision: 3082
Merged at revision: 3082
Proposed branch: lp:~zyga/checkbox/fix-1092925
Merge into: lp:checkbox
Diff against target: 14 lines (+2/-1)
1 file modified
providers/plainbox-provider-checkbox/bin/rotation_test (+2/-1)
To merge this branch: bzr merge lp:~zyga/checkbox/fix-1092925
Reviewer Review Type Date Requested Status
Daniel Manrique (community) Approve
Review via email: mp+223540@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Daniel Manrique (roadmr) wrote :

Thanks! A tiny additional fix is needed, see inline comment.

review: Needs Fixing
Revision history for this message
Zygmunt Krynicki (zyga) wrote :

(empty message aka see the silly inline comment thing)

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

Sorry! No, apparently I'm the one missing stuff :)

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'providers/plainbox-provider-checkbox/bin/rotation_test'
2--- providers/plainbox-provider-checkbox/bin/rotation_test 2014-01-07 13:43:22 +0000
3+++ providers/plainbox-provider-checkbox/bin/rotation_test 2014-06-18 11:54:00 +0000
4@@ -45,8 +45,9 @@
5 for rot in rotations:
6 try:
7 status = rotate_screen(rotations[rot])
8- except(xrandr.RRError, xrandr.UnsupportedRRError) as error:
9+ except (xrandr.RRError, xrandr.UnsupportedRRError) as exc:
10 status = 1
11+ error = exc
12 else:
13 error = 'N/A'
14 # Collect the status and the error message

Subscribers

People subscribed via source and target branches