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

[Zygmunt Krynicki]

[Daniel Manrique (roadmr)]

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

review: Needs Fixing

[Zygmunt Krynicki (zyga)]

(empty message aka see the silly inline comment thing)

[Daniel Manrique (roadmr)]

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

review: Approve

=== modified file 'providers/plainbox-provider-checkbox/bin/rotation_test'
--- providers/plainbox-provider-checkbox/bin/rotation_test	2014-01-07 13:43:22 +0000
+++ providers/plainbox-provider-checkbox/bin/rotation_test	2014-06-18 11:54:00 +0000
@@ -45,8 +45,9 @@
     for rot in rotations:
         try:
             status = rotate_screen(rotations[rot])
-        except(xrandr.RRError, xrandr.UnsupportedRRError) as error:
+        except (xrandr.RRError, xrandr.UnsupportedRRError) as exc:
             status = 1
+            error = exc
         else:
             error = 'N/A'
         # Collect the status and the error message