mirror of
https://github.com/qgis/QGIS.git
synced 2025-10-05 00:09:32 -04:00
fix ab5f06b (ouch)
This commit is contained in:
parent
0168bd5c68
commit
c6117e0d32
@ -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')
|
||||
|
@ -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')
|
||||
|
Loading…
x
Reference in New Issue
Block a user