hlrs-software-stack/spack
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix bug introduced by pull request 14467 being merged (#14639)

Browse source 
* Fix bug introduced by pull request 14467 being merged

* Only filter on platform and OS
This commit is contained in:
Patrick Gartung 2020-01-27 14:17:15 -06:00 committed by GitHub
parent 893b0792e4
commit 9ffa053f18
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
lib/spack/spack/binary_distribution.py
View file

@ -690,7 +690,10 @@ def get_specs(force=False, use_arch=False):
for file in files: for file in files:
if re.search('spec.yaml', file): if re.search('spec.yaml', file):
link = url_util.join(fetch_url_build_cache, file) link = url_util.join(fetch_url_build_cache, file)
if use_arch and re.search(spack.architecture(), file): if use_arch and re.search('%s-%s' %
(spack.architecture.platform,
spack.architecture.os),
file):
urls.add(link) urls.add(link)
else: else:
urls.add(link) urls.add(link)
@ -701,7 +704,10 @@ def get_specs(force=False, use_arch=False):
url_util.join(fetch_url_build_cache, 'index.html')) url_util.join(fetch_url_build_cache, 'index.html'))
for link in links: for link in links:
if re.search("spec.yaml", link): if re.search("spec.yaml", link):
if use_arch and re.search(spack.architecture(), link): if use_arch and re.search('%s-%s' %
(spack.architecture.platform,
spack.architecture.os),
link):
urls.add(link) urls.add(link)
else: else:
urls.add(link) urls.add(link)