sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-02-28 00:17:30 -05:00
Code Issues Packages Projects Releases Wiki Activity

Revert "[processing] Extra check to ensure GRASS folder setting not already None"

Browse Source 
This reverts commit 36a820e51657bf0c3069e1fd287d6b452a3cd1e0.
This commit is contained in:
Larry Shaffer 2016-04-25 21:27:45 -06:00
parent 36a820e516
commit b3a0d9d146
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
python/plugins/processing/algs/grass/GrassUtils.py
View File

@ -87,7 +87,7 @@ class GrassUtils:
return ''
folder = ProcessingConfig.getSetting(GrassUtils.GRASS_FOLDER) or ''
if folder and not os.path.exists(folder):
if not os.path.exists(folder):
folder = None
if folder is None:
if isWindows():
@ -111,7 +111,7 @@ class GrassUtils:
@staticmethod
def grassWinShell():
folder = ProcessingConfig.getSetting(GrassUtils.GRASS_WIN_SHELL) or ''
if folder and not os.path.exists(folder):
if not os.path.exists(folder):
folder = None
if folder is None:
folder = os.path.dirname(unicode(QgsApplication.prefixPath()))

2
python/plugins/processing/algs/grass7/Grass7Utils.py
View File

@ -84,7 +84,7 @@ class Grass7Utils:
return ''
folder = ProcessingConfig.getSetting(Grass7Utils.GRASS_FOLDER) or ''
if folder and not os.path.exists(folder):
if not os.path.exists(folder):
folder = None
if folder is None:
if isWindows():