[GRASS-SVN] r67194 - grass/trunk/scripts/g.extension

svn_grass at osgeo.org svn_grass at osgeo.org
Thu Dec 17 01:07:19 PST 2015


Author: martinl
Date: 2015-12-17 01:07:19 -0800 (Thu, 17 Dec 2015)
New Revision: 67194

Modified:
   grass/trunk/scripts/g.extension/g.extension.py
Log:
g.extension: fix windows 32/64bit issue

Modified: grass/trunk/scripts/g.extension/g.extension.py
===================================================================
--- grass/trunk/scripts/g.extension/g.extension.py	2015-12-17 09:05:05 UTC (rev 67193)
+++ grass/trunk/scripts/g.extension/g.extension.py	2015-12-17 09:07:19 UTC (rev 67194)
@@ -883,10 +883,11 @@
     # http://wingrass.fsv.cvut.cz/grassXX/addonsX.X.X
     grass.message(_("Downloading precompiled GRASS Addons <%s>...") %
                   options['extension'])
-    url = "http://wingrass.fsv.cvut.cz/" \
+    url = "http://wingrass.fsv.cvut.cz/%(platform)s/" \
           "grass%(major)s%(minor)s/addons/" \
           "grass-%(major)s.%(minor)s.%(patch)s/" % \
-        {'major': version[0], 'minor': version[1], 'patch': version[2]}
+        {'platform' : build_platform, 'major': version[0],
+         'minor': version[1], 'patch': version[2]}
 
     grass.debug("url=%s" % url, 1)
 
@@ -1688,5 +1689,9 @@
     global TMPDIR
     TMPDIR = tempfile.mkdtemp()
     atexit.register(cleanup)
-    version = grass.version()['version'].split('.')
+    
+    grass_version = grass.version()
+    version = grass_version['version'].split('.')
+    build_platform = grass_version['build_platform'].split('-', 1)[0]
+    
     sys.exit(main())



More information about the grass-commit mailing list