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

Proposed by Zygmunt Krynicki on 2014-06-17
Status: Merged
Approved by: Daniel Manrique on 2014-06-17
Approved revision: 3079
Merged at revision: 3080
Proposed branch: lp:~zyga/checkbox/fix-1235426
Merge into: lp:checkbox
Diff against target: 10 lines (+0/-1)
1 file modified
providers/plainbox-provider-checkbox/bin/camera_test (+0/-1)
To merge this branch: bzr merge lp:~zyga/checkbox/fix-1235426
Reviewer Review Type Date Requested Status
Daniel Manrique 2014-06-17 Approve on 2014-06-17
Review via email: mp+223407@code.launchpad.net
To post a comment you must log in.
Daniel Manrique (roadmr) wrote :

Simple but to the point. Thanks!

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/camera_test'
2--- providers/plainbox-provider-checkbox/bin/camera_test 2014-03-20 14:01:58 +0000
3+++ providers/plainbox-provider-checkbox/bin/camera_test 2014-06-17 14:21:17 +0000
4@@ -441,7 +441,6 @@
5 if e.errno != errno.EINVAL:
6 print("Unable to determine supported framesizes "
7 "(resolutions), this may be a driver issue.")
8- return supported_formats
9 supported_format['resolutions'] = resolutions
10 return supported_formats
11

Subscribers

People subscribed via source and target branches