[processing] Add 'call' statements to SAGA batch file

volaya · volaya · commit 08c8f9a1925a · 2019-03-20T09:44:34.000Z
diff --git a/python/plugins/processing/algs/saga/SagaUtils.py b/python/plugins/processing/algs/saga/SagaUtils.py
@@ -109,7 +109,10 @@ def createSagaBatchJobFileFromSagaCommands(commands):
         else:
             pass
         for command in commands:
-            fout.write('saga_cmd ' + command + '\n')
+            if isWindows():
+                fout.write('call saga_cmd ' + command + '\n')
+            else:
+                fout.write('saga_cmd ' + command + '\n')
 
         fout.write('exit')
 
@@ -163,8 +166,8 @@ def executeSaga(feedback):
     if isWindows():
         command = ['cmd.exe', '/C ', sagaBatchJobFilename()]
     else:
-        os.chmod(sagaBatchJobFilename(), stat.S_IEXEC |
-                 stat.S_IREAD | stat.S_IWRITE)
+        os.chmod(sagaBatchJobFilename(), stat.S_IEXEC 
+                | stat.S_IREAD | stat.S_IWRITE)
         command = ["'" + sagaBatchJobFilename() + "'"]
     loglines = []
     loglines.append(QCoreApplication.translate('SagaUtils', 'SAGA execution console output'))
