From: Calin Crisan <ccrisan@gmail.com>
Date: Sat, 18 Jan 2014 18:16:53 +0000 (+0200)
Subject: exit status from grep when listing video formats is now ignored
X-Git-Url: http://www.vanbest.org/gitweb/?a=commitdiff_plain;h=0448979ab093bd725893b9ab66acca1fd59c5e6c;p=motioneye-debian

exit status from grep when listing video formats is now ignored
---

diff --git a/src/v4l2ctl.py b/src/v4l2ctl.py
index 505579e..1412ce9 100644
--- a/src/v4l2ctl.py
+++ b/src/v4l2ctl.py
@@ -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'):