[processing] swallow possible exceptions when reading console output …

…from SAGA
qgis · May 20, 2015 · 57d21c8 · 57d21c8
1 parent 960e6d8
commit 57d21c8
Showing 1 changed file with 19 additions and 13 deletions.
diff --git a/python/plugins/processing/algs/saga/SagaUtils.py b/python/plugins/processing/algs/saga/SagaUtils.py
@@ -121,7 +121,10 @@ def getSagaInstalledVersion(runSaga=False):
             stderr=subprocess.STDOUT,
             universal_newlines=True,
         ).stdout
-        lines = proc.readlines()
+        try:
+            lines = proc.readlines()
+        except:
+            return None
         for line in lines:
             if line.startswith("SAGA Version:"):
                 _installedVersion = line[len("SAGA Version:"):].strip().split(" ")[0]
@@ -145,17 +148,20 @@ def executeSaga(progress):
         stderr=subprocess.STDOUT,
         universal_newlines=True,
     ).stdout
-    for line in iter(proc.readline, ''):
-        if '%' in line:
-            s = ''.join([x for x in line if x.isdigit()])
-            try:
-                progress.setPercentage(int(s))
-            except:
-                pass
-        else:
-            line = line.strip()
-            if line != '/' and line != '-' and line != '\\' and line != '|':
-                loglines.append(line)
-                progress.setConsoleInfo(line)
+    try:
+        for line in iter(proc.readline, ''):
+            if '%' in line:
+                s = ''.join([x for x in line if x.isdigit()])
+                try:
+                    progress.setPercentage(int(s))
+                except:
+                    pass
+            else:
+                line = line.strip()
+                if line != '/' and line != '-' and line != '\\' and line != '|':
+                    loglines.append(line)
+                    progress.setConsoleInfo(line)
+    except:
+        pass
     if ProcessingConfig.getSetting(SAGA_LOG_CONSOLE):
         ProcessingLog.addToLog(ProcessingLog.LOG_INFO, loglines)