[GRASS-SVN] r67537 - grass/trunk/lib/python/pygrass

svn_grass at osgeo.org svn_grass at osgeo.org
Sun Jan 10 04:25:57 PST 2016


Author: martinl
Date: 2016-01-10 04:25:57 -0800 (Sun, 10 Jan 2016)
New Revision: 67537

Modified:
   grass/trunk/lib/python/pygrass/utils.py
Log:
pygrass: fix set_path() when compiling g.gui.mwprecip addons (GRASS installed from package)

Modified: grass/trunk/lib/python/pygrass/utils.py
===================================================================
--- grass/trunk/lib/python/pygrass/utils.py	2016-01-10 11:12:34 UTC (rev 67536)
+++ grass/trunk/lib/python/pygrass/utils.py	2016-01-10 12:25:57 UTC (rev 67537)
@@ -300,10 +300,15 @@
     elif getenv('GRASS_ADDON_BASE') and \
             isdir(join(getenv('GRASS_ADDON_BASE'), modname, modname)):
         path = join(os.getenv('GRASS_ADDON_BASE'), modname, modname)
-    elif libname and isdir(join('..', libname)):
+    elif libname and isdir(join('..', libname)): # used by g.extension compilation process
         path = join('..', libname)
+    elif isdir(join('..', 'etc', modname)):      # used by g.extension compilation process
+        path = join('..', 'etc', modname)
+    elif isdir(join('etc', modname)):            # used by g.extension compilation process
+        path = join('etc', modname)
     else:
         path = None
+    
     return path
 
 



More information about the grass-commit mailing list