Explorar o código

g.extension: remove build_platform (only 64bit provided on MS Windows) (#2102)

Martin Landa %!s(int64=3) %!d(string=hai) anos
pai
achega
15750aaaf6
Modificáronse 1 ficheiros con 5 adicións e 15 borrados
  1. 5 15
      scripts/g.extension/g.extension.py

+ 5 - 15
scripts/g.extension/g.extension.py

@@ -1422,24 +1422,16 @@ def install_module_xml(mlist):
 def install_extension_win(name):
 def install_extension_win(name):
     """Install extension on MS Windows"""
     """Install extension on MS Windows"""
     grass.message(
     grass.message(
-        _("Downloading precompiled GRASS Addons <%s>...") % options["extension"]
+        _("Downloading precompiled GRASS Addons <{}>...").format(options["extension"])
     )
     )
 
 
     # build base URL
     # build base URL
-    if build_platform == "x86_64":
-        platform = build_platform
-    else:
-        platform = "x86"
     base_url = (
     base_url = (
         "http://wingrass.fsv.cvut.cz/"
         "http://wingrass.fsv.cvut.cz/"
-        "grass%(major)s%(minor)s/%(platform)s/addons/"
-        "grass-%(major)s.%(minor)s.%(patch)s"
-        % {
-            "platform": platform,
-            "major": version[0],
-            "minor": version[1],
-            "patch": version[2],
-        }
+        "grass{major}{minor}/addons/"
+        "grass-{major}.{minor}.{patch}".format(
+            major=version[0], minor=version[1], patch=version[2]
+        )
     )
     )
 
 
     # resolve ZIP URL
     # resolve ZIP URL
@@ -2647,6 +2639,4 @@ if __name__ == "__main__":
     grass_version = grass.version()
     grass_version = grass.version()
     version = grass_version["version"].split(".")
     version = grass_version["version"].split(".")
 
 
-    build_platform = grass_version["build_platform"].split("-", 1)[0]
-
     sys.exit(main())
     sys.exit(main())