From ae82650174cd845fafa4f0e79d90b2a2d426e4c3 Mon Sep 17 00:00:00 2001 From: Peter Scheibel Date: Thu, 23 Jul 2020 10:58:59 -0700 Subject: [PATCH] Update fetch order to match iteration order of MirrorReference (#17572) --- lib/spack/spack/stage.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/lib/spack/spack/stage.py b/lib/spack/spack/stage.py index 01f499bd0b..95e7dcc592 100644 --- a/lib/spack/spack/stage.py +++ b/lib/spack/spack/stage.py @@ -414,10 +414,11 @@ def fetch(self, mirror_only=False): # Join URLs of mirror roots with mirror paths. Because # urljoin() will strip everything past the final '/' in # the root, so we add a '/' if it is not present. - urls = [] + mirror_urls = [] for mirror in spack.mirror.MirrorCollection().values(): for rel_path in self.mirror_paths: - urls.append(url_util.join(mirror.fetch_url, rel_path)) + mirror_urls.append( + url_util.join(mirror.fetch_url, rel_path)) # If this archive is normally fetched from a tarball URL, # then use the same digest. `spack mirror` ensures that @@ -435,7 +436,8 @@ def fetch(self, mirror_only=False): self.skip_checksum_for_mirror = not bool(digest) # Add URL strategies for all the mirrors with the digest - for url in urls: + # Insert fetchers in the order that the URLs are provided. + for url in reversed(mirror_urls): fetchers.insert( 0, fs.from_url_scheme( url, digest, expand=expand, extension=extension))