fix some ogr tools in master

qgis · Feb 8, 2017 · 566c058 · 566c058
1 parent 2f68d1a
commit 566c058
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 5 deletions.
diff --git a/python/plugins/processing/algs/gdal/ogr2ogr.py b/python/plugins/processing/algs/gdal/ogr2ogr.py
@@ -134,7 +134,8 @@ def getConsoleCommands(self):
         arguments = []
         arguments.append('-f')
         arguments.append(outFormat)
-        if len(options) > 0:
+
+        if options is not None and len(options.strip()) > 0:
             arguments.append(options)
 
         arguments.append(output)

diff --git a/python/plugins/processing/algs/gdal/ogr2ogrclip.py b/python/plugins/processing/algs/gdal/ogr2ogrclip.py
@@ -75,7 +75,8 @@ def getConsoleCommands(self):
         arguments.append(ogrClipLayer)
         arguments.append("-clipsrclayer")
         arguments.append(ogrLayerName(clipLayer))
-        if len(options) > 0:
+
+        if options is not None and len(options.strip()) > 0:
             arguments.append(options)
 
         arguments.append(output)

diff --git a/python/plugins/processing/algs/gdal/ogr2ogrclipextent.py b/python/plugins/processing/algs/gdal/ogr2ogrclipextent.py
@@ -78,7 +78,7 @@ def getConsoleCommands(self):
         arguments.append(regionCoords[3])
         arguments.append('-clipsrc spat_extent')
 
-        if len(options) > 0:
+        if options is not None and len(options.strip()) > 0:
             arguments.append(options)
 
         arguments.append(output)

diff --git a/python/plugins/processing/algs/gdal/ogr2ogrdissolve.py b/python/plugins/processing/algs/gdal/ogr2ogrdissolve.py
@@ -134,7 +134,7 @@ def getConsoleCommands(self):
         if not multi:
             arguments.append('-explodecollections')
 
-        if options is not None and len(options) > 0:
+        if options is not None and len(options.strip()) > 0:
             arguments.append(options)
 
         commands = []

diff --git a/python/plugins/processing/algs/gdal/ogr2ogrpointsonlines.py b/python/plugins/processing/algs/gdal/ogr2ogrpointsonlines.py
@@ -90,7 +90,7 @@ def getConsoleCommands(self):
         arguments.append(layername)
         arguments.append('"')
 
-        if len(options) > 0:
+        if options is not None and len(options.strip()) > 0:
             arguments.append(options)
 
         commands = []