Skip to content
Permalink
Browse files

really fix ab5f06b (ouch again - machine mixup)

  • Loading branch information
jef-n authored and j08lue committed Jun 8, 2016
1 parent 4904629 commit 9be98acf5314df7a3f8134c47fb309f8f8a5548a
@@ -92,7 +92,7 @@ def grassPath():
if folder is None:
if isWindows():
if "OSGEO4W_ROOT" in os.environ:
testfolder = os.path.join(unicode(os.environ['OSGEO4W_ROOT']), "apps", "grass")
testfolder = os.path.join(unicode(os.environ['OSGEO4W_ROOT']), "apps")
else:
testfolder = unicode(QgsApplication.prefixPath())
testfolder = os.path.join(testfolder, 'grass')
@@ -89,7 +89,7 @@ def grassPath():
if folder is None:
if isWindows():
if "OSGEO4W_ROOT" in os.environ:
testfolder = os.path.join(unicode(os.environ['OSGEO4W_ROOT']), "apps", "grass")
testfolder = os.path.join(unicode(os.environ['OSGEO4W_ROOT']), "apps")
else:
testfolder = unicode(QgsApplication.prefixPath())
testfolder = os.path.join(testfolder, 'grass')
@@ -103,7 +103,7 @@ def grassPath():
if not os.path.isdir(folder):
folder = '/Applications/GRASS-7.0.app/Contents/MacOS'

return folder
return folder or ''

@staticmethod
def grassDescriptionPath():

0 comments on commit 9be98ac

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