follow redirects

Author: timfel

graalpython/lib-graalpython/modules/ginstall.py

@@ -494,15 +494,15 @@ def _install_from_url(url, patch=None, extra_opts=[], add_cflags="", ignore_erro
     cppflags = os.environ.get("CPPFLAGS", "")
     cflags = "-v " + os.environ.get("CFLAGS", "") + ((" " + add_cflags) if add_cflags else "")
 
-    if os.system("curl -o %s/%s %s" % (tempdir, name, url)) != 0:
+    if os.system("curl -L -o %s/%s %s" % (tempdir, name, url)) != 0:
         # honor env var 'HTTP_PROXY' and 'HTTPS_PROXY'
         env = os.environ
         curl_opts = []
         if url.startswith("http://") and "HTTP_PROXY" in env:
             curl_opts += ["--proxy", env["HTTP_PROXY"]]
         elif url.startswith("https://") and "HTTPS_PROXY" in env:
             curl_opts += ["--proxy", env["HTTPS_PROXY"]]
-        system("curl %s -o %s/%s %s" % (" ".join(curl_opts), tempdir, name, url), msg="Download error")
+        system("curl -L %s -o %s/%s %s" % (" ".join(curl_opts), tempdir, name, url), msg="Download error")
 
     if name.endswith(".tar.gz"):
         system("tar xzf %s/%s -C %s" % (tempdir, name, tempdir), msg="Error extracting tar.gz")
@@ -544,7 +544,8 @@ def install_from_pypi(package, patch=None, extra_opts=[], add_cflags="", ignore_
         # this is already the url to the actual package
         pass
     else:
-        r = subprocess.check_output("curl %s" % url, shell=True).decode("utf8")
+        r = subprocess.check_output("curl -L %s" % url, shell=True).decode("utf8")
+        url = None
         try:
             urls = json.loads(r)["urls"]
         except: