Skip to content
Permalink
Browse files

[processing] prevent grass installation check returning None when fol…

…der not set under windows
  • Loading branch information
volaya committed Apr 19, 2014
1 parent 1d821d6 commit f014b4f0978220e9add37df0b2840d7542f2c28e
Showing with 4 additions and 5 deletions.
  1. +4 −5 python/plugins/processing/algs/grass/GrassUtils.py
@@ -88,20 +88,19 @@ def grassPath():
folder = ProcessingConfig.getSetting(GrassUtils.GRASS_FOLDER)
if folder is None:
if isWindows():
testfolder = os.path.dirname(str(QgsApplication.prefixPath()))
testfolder = os.path.dirname(QgsApplication.prefixPath())
testfolder = os.path.join(testfolder, 'grass')
if os.path.isdir(testfolder):
for subfolder in os.listdir(testfolder):
if subfolder.startswith('grass'):
folder = os.path.join(testfolder, subfolder)
break
break
else:
folder = os.path.join(str(QgsApplication.prefixPath()), 'grass'
)
folder = os.path.join(QgsApplication.prefixPath(), 'grass')
if not os.path.isdir(folder):
folder = '/Applications/GRASS-6.4.app/Contents/MacOS'

return folder
return folder or ''

@staticmethod
def grassWinShell():

0 comments on commit f014b4f

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