[GRASS-SVN] r50845 - grass/branches/releasebranch_6_4/gui/scripts

[svn_grass at osgeo.org]

Author: martinl
Date: 2012-02-17 12:53:12 -0800 (Fri, 17 Feb 2012)
New Revision: 50845

Modified:
   grass/branches/releasebranch_6_4/gui/scripts/g.extension.py
Log:
g.extension.py: wingrass-addons url updated

Modified: grass/branches/releasebranch_6_4/gui/scripts/g.extension.py
===================================================================
--- grass/branches/releasebranch_6_4/gui/scripts/g.extension.py	2012-02-17 20:29:49 UTC (rev 50844)
+++ grass/branches/releasebranch_6_4/gui/scripts/g.extension.py	2012-02-17 20:53:12 UTC (rev 50845)
@@ -428,12 +428,10 @@
     ### TODO: do not use hardcoded url - http://wingrass.fsv.cvut.cz/grassXX/addonsX.X.X
     version = grass.version()['version'].split('.')
     grass.message(_("Downloading precompiled GRASS Addons <%s>...") % options['extension'])
-    url = "http://wingrass.fsv.cvut.cz/grass%s%s/addons" % (version[0], version[1])
+    url = "http://wingrass.fsv.cvut.cz/grass%s%s/addons/grass-%s.%s.%s" % \
+        (version[0], version[1], version[0], version[1], version[2])
+    grass.debug("url=%s" % url, 0)
     
-    if version[2][-3:] != 'svn':
-        url += '%s.%s.%s' % (version[0], version[1], version[2])
-    grass.debug("url=%s" % url, 1)
-    
     try:
         f = urlopen(url + '/' + options['extension'] + '.zip')