fix ab5f06b (ouch)

This commit is contained in:
Juergen E. Fischer 2016-03-31 22:56:35 +02:00
parent 0168bd5c68
commit c6117e0d32
2 changed files with 4 additions and 4 deletions

View File

@ -89,8 +89,8 @@ class GrassUtils:
folder = ProcessingConfig.getSetting(GrassUtils.GRASS_FOLDER)
if folder is None:
if isWindows():
if "OSGEO4W_ROOT" in environ:
testfolder = os.path.join(unicode(environ['OSGEO4W_ROOT']), "apps", "grass")
if "OSGEO4W_ROOT" in os.environ:
testfolder = os.path.join(unicode(os.environ['OSGEO4W_ROOT']), "apps", "grass")
else:
testfolder = unicode(QgsApplication.prefixPath())
testfolder = os.path.join(testfolder, 'grass')

View File

@ -87,8 +87,8 @@ class Grass7Utils:
folder = ProcessingConfig.getSetting(Grass7Utils.GRASS_FOLDER)
if folder is None:
if isWindows():
if "OSGEO4W_ROOT" in environ:
testfolder = os.path.join(unicode(environ['OSGEO4W_ROOT']), "apps", "grass")
if "OSGEO4W_ROOT" in os.environ:
testfolder = os.path.join(unicode(os.environ['OSGEO4W_ROOT']), "apps", "grass")
else:
testfolder = unicode(QgsApplication.prefixPath())
testfolder = os.path.join(testfolder, 'grass')