From d60b09ce42ea8f8b862a84ce162a2ba025e1776e Mon Sep 17 00:00:00 2001 From: Rust Maintainers Date: Mon, 1 Jan 2018 13:27:19 +0000 Subject: [PATCH] d-dont-download-stage0 Gbp-Pq: Name d-dont-download-stage0.patch --- src/bootstrap/bootstrap.py | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/bootstrap/bootstrap.py b/src/bootstrap/bootstrap.py index 735bb9bb04..fb5530a54e 100644 --- a/src/bootstrap/bootstrap.py +++ b/src/bootstrap/bootstrap.py @@ -24,16 +24,18 @@ import tempfile from time import time -def get(url, path, verbose=False): +def get(url, path, verbose=False, use_local_hash_if_present=True): suffix = '.sha256' sha_url = url + suffix with tempfile.NamedTemporaryFile(delete=False) as temp_file: temp_path = temp_file.name - with tempfile.NamedTemporaryFile(suffix=suffix, delete=False) as sha_file: - sha_path = sha_file.name + sha_path = path + suffix try: - download(sha_path, sha_url, False, verbose) + if use_local_hash_if_present and os.path.exists(sha_path): + print("using already-download file " + sha_path) + else: + download(sha_path, sha_url, False, verbose) if os.path.exists(path): if verify(path, sha_path, False): if verbose: @@ -51,7 +53,6 @@ def get(url, path, verbose=False): print("moving {} to {}".format(temp_path, path)) shutil.move(temp_path, path) finally: - delete_if_present(sha_path, verbose) delete_if_present(temp_path, verbose) @@ -373,7 +374,7 @@ class RustBuild(object): url = "{}/dist/{}".format(self._download_url, self.date) tarball = os.path.join(rustc_cache, filename) - if not os.path.exists(tarball): + if True: get("{}/{}".format(url, filename), tarball, verbose=self.verbose) unpack(tarball, self.bin_root(), match=pattern, verbose=self.verbose) -- 2.30.2