zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update fetch order to match iteration order of MirrorReference (#17572)

Browse Source
This commit is contained in:
Peter Scheibel 2020-07-23 10:58:59 -07:00 committed by Gregory Becker
parent d5b0f85ea3
commit 3b45241566
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/spack/spack/stage.py
View File

@ -414,10 +414,11 @@ def fetch(self, mirror_only=False):
# Join URLs of mirror roots with mirror paths. Because # Join URLs of mirror roots with mirror paths. Because
# urljoin() will strip everything past the final '/' in # urljoin() will strip everything past the final '/' in
# the root, so we add a '/' if it is not present. # the root, so we add a '/' if it is not present.
urls = [] mirror_urls = []
for mirror in spack.mirror.MirrorCollection().values(): for mirror in spack.mirror.MirrorCollection().values():
for rel_path in self.mirror_paths: 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, # If this archive is normally fetched from a tarball URL,
# then use the same digest. `spack mirror` ensures that # 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) self.skip_checksum_for_mirror = not bool(digest)
# Add URL strategies for all the mirrors with the 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( fetchers.insert(
0, fs.from_url_scheme( 0, fs.from_url_scheme(
url, digest, expand=expand, extension=extension)) url, digest, expand=expand, extension=extension))