]> www.vanbest.org Git - motioneye-debian/commitdiff
exit status from grep when listing video formats is now ignored
authorCalin Crisan <ccrisan@gmail.com>
Sat, 18 Jan 2014 18:16:53 +0000 (20:16 +0200)
committerCalin Crisan <ccrisan@gmail.com>
Sat, 18 Jan 2014 18:16:53 +0000 (20:16 +0200)
src/v4l2ctl.py

index 505579e209b391be3994b6930d6f7824e340188b..1412ce99ca484f05cf32b8fd2655f3a6a01c1596 100644 (file)
@@ -71,7 +71,7 @@ def list_resolutions(device):
     logging.debug('listing resolutions of device %(device)s...' % {'device': device})
     
     resolutions = set()
-    output = subprocess.check_output('v4l2-ctl -d %(device)s --list-formats-ext | grep -oE "[0-9]+x[0-9]+"' % {
+    output = subprocess.check_output('v4l2-ctl -d %(device)s --list-formats-ext | grep -oE "[0-9]+x[0-9]+" || true' % {
             'device': device}, shell=True)
 
     for pair in output.split('\n'):