Skip to content
Permalink
Browse files

[processing] fix path handling (fix #14432)

  • Loading branch information
alexbruy committed Apr 11, 2016
1 parent 4815ebd commit e873540d14cb102ffe9318063b32c323c56e5bfb
@@ -86,7 +86,7 @@ def grassPath():
if not isWindows() and not isMac():
return ''

folder = ProcessingConfig.getSetting(GrassUtils.GRASS_FOLDER)
folder = ProcessingConfig.getSetting(GrassUtils.GRASS_FOLDER) or ''
if not os.path.exists(folder):
folder = None
if folder is None:
@@ -110,7 +110,7 @@ def grassPath():

@staticmethod
def grassWinShell():
folder = ProcessingConfig.getSetting(GrassUtils.GRASS_WIN_SHELL)
folder = ProcessingConfig.getSetting(GrassUtils.GRASS_WIN_SHELL) or ''
if not os.path.exists(folder):
folder = None
if folder is None:
@@ -83,7 +83,7 @@ def grassPath():
if not isWindows() and not isMac():
return ''

folder = ProcessingConfig.getSetting(Grass7Utils.GRASS_FOLDER)
folder = ProcessingConfig.getSetting(Grass7Utils.GRASS_FOLDER) or ''
if not os.path.exists(folder):
folder = None
if folder is None:
@@ -101,24 +101,15 @@ def findOtbLibPath():


def otbLibPath():
folder = ProcessingConfig.getSetting(OTB_LIB_FOLDER)
if folder is None:
folder = ""
return folder
return ProcessingConfig.getSetting(OTB_LIB_FOLDER) or ''


def otbSRTMPath():
folder = ProcessingConfig.getSetting(OTB_SRTM_FOLDER)
if folder is None:
folder = ""
return folder
return ProcessingConfig.getSetting(OTB_SRTM_FOLDER) or ''


def otbGeoidPath():
filepath = ProcessingConfig.getSetting(OTB_GEOID_FILE)
if filepath is None:
filepath = ""
return filepath
return ProcessingConfig.getSetting(OTB_GEOID_FILE) or ''


def otbDescriptionPath():

1 comment on commit e873540

@dakcarto

This comment has been minimized.

Copy link
Member

@dakcarto dakcarto commented on e873540 Apr 26, 2016

@alexbruy, sorry for the noise. Figured out that this needs backported to release-2_14, but didn't do it because I wasn't sure if there were other backports for Processing that needed done in a certain order before this one.

Without this backported, new installs of QGIS are missing GRASS providers.

Please sign in to comment.
You can’t perform that action at this time.