Skip to content

Simplify rustbuild Rust beta downloading. #36666

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Simplify rustbuild Rust beta downloading. #36666

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 11 additions & 11 deletions src/bootstrap/bootstrap.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,11 @@

from time import time

try:
from urllib2 import urlopen
except ImportError:
from urllib.request import urlopen


def get(url, path, verbose=False):
sha_url = url + ".sha256"
Expand All @@ -30,15 +35,15 @@ def get(url, path, verbose=False):
sha_path = sha_file.name

try:
download(sha_path, sha_url, verbose)
download(sha_path, sha_url)
if os.path.exists(path):
if verify(path, sha_path, False):
print("using already-download file " + path)
return
else:
print("ignoring already-download file " + path + " due to failed verification")
os.unlink(path)
download(temp_path, url, verbose)
download(temp_path, url)
if not verify(temp_path, sha_path, True):
raise RuntimeError("failed verification")
print("moving {} to {}".format(temp_path, path))
Expand All @@ -54,16 +59,11 @@ def delete_if_present(path):
os.unlink(path)


def download(path, url, verbose):
def download(path, url):
print("downloading {} to {}".format(url, path))
# see http://serverfault.com/questions/301128/how-to-download
if sys.platform == 'win32':
run(["PowerShell.exe", "/nologo", "-Command",
"(New-Object System.Net.WebClient)"
".DownloadFile('{}', '{}')".format(url, path)],
verbose=verbose)
else:
run(["curl", "-o", path, url], verbose=verbose)
request = urlopen(url)
with open(path, 'wb') as file_:
file_.write(request.read())


def verify(path, sha_path, verbose):
Expand Down