Skip to content

Commit

Permalink
Merge pull request #4117 from NaturalGIS/fix_qgis3_ogrtools
Browse files Browse the repository at this point in the history
[processing] fix some ogr tools in master
  • Loading branch information
alexbruy authored Feb 8, 2017
2 parents 2f68d1a + 566c058 commit bd6e068
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 5 deletions.
3 changes: 2 additions & 1 deletion python/plugins/processing/algs/gdal/ogr2ogr.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
3 changes: 2 additions & 1 deletion python/plugins/processing/algs/gdal/ogr2ogrclip.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion python/plugins/processing/algs/gdal/ogr2ogrclipextent.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion python/plugins/processing/algs/gdal/ogr2ogrdissolve.py
Original file line number Diff line number Diff line change
Expand Up @@ -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 = []
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 = []
Expand Down

0 comments on commit bd6e068

Please sign in to comment.