From 3221b1c83fc00d4f292b2b767a27e4bfcef0f88b Mon Sep 17 00:00:00 2001 From: "Juergen E. Fischer" Date: Sun, 27 Jan 2019 17:37:23 +0100 Subject: [PATCH] osgeo4w: handle grass svn versions (fixes #21114) (cherry picked from commit febbc4f0b9e6f1e1c74c18bcb117148d6587ff87) --- python/plugins/processing/algs/grass7/Grass7Utils.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python/plugins/processing/algs/grass7/Grass7Utils.py b/python/plugins/processing/algs/grass7/Grass7Utils.py index f8e5e6e9f72b..22b41f2ad493 100644 --- a/python/plugins/processing/algs/grass7/Grass7Utils.py +++ b/python/plugins/processing/algs/grass7/Grass7Utils.py @@ -209,7 +209,7 @@ def grassPath(): testfolder = str(QgsApplication.prefixPath()) testfolder = os.path.join(testfolder, 'grass') if os.path.isdir(testfolder): - grassfolders = sorted([f for f in os.listdir(testfolder) if f.startswith("grass-7.") and os.path.isdir(os.path.join(testfolder, f))], reverse=True, key=lambda x: [int(v) for v in x[len("grass-"):].split('.')]) + grassfolders = sorted([f for f in os.listdir(testfolder) if f.startswith("grass-7.") and os.path.isdir(os.path.join(testfolder, f))], reverse=True, key=lambda x: [int(v) for v in x[len("grass-"):].split('.') if v != 'svn']) if grassfolders: folder = os.path.join(testfolder, grassfolders[0]) elif isMac():