summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrick Gartung <gartung@fnal.gov>2020-01-27 14:17:15 -0600
committerGitHub <noreply@github.com>2020-01-27 14:17:15 -0600
commit9ffa053f18533a020152ce86e50b32b47720b8c9 (patch)
treefb22a03ea35e28047969080eff9d6c7899f65a36
parent893b0792e42b3fdaa1fe9d4ea3abd1c691bdd598 (diff)
downloadspack-9ffa053f18533a020152ce86e50b32b47720b8c9.tar.gz
spack-9ffa053f18533a020152ce86e50b32b47720b8c9.tar.bz2
spack-9ffa053f18533a020152ce86e50b32b47720b8c9.tar.xz
spack-9ffa053f18533a020152ce86e50b32b47720b8c9.zip
Fix bug introduced by pull request 14467 being merged (#14639)
* Fix bug introduced by pull request 14467 being merged * Only filter on platform and OS
-rw-r--r--lib/spack/spack/binary_distribution.py10
1 files changed, 8 insertions, 2 deletions
diff --git a/lib/spack/spack/binary_distribution.py b/lib/spack/spack/binary_distribution.py
index 55feacc7c4..64ce23a8d6 100644
--- a/lib/spack/spack/binary_distribution.py
+++ b/lib/spack/spack/binary_distribution.py
@@ -690,7 +690,10 @@ def get_specs(force=False, use_arch=False):
for file in files:
if re.search('spec.yaml', 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)
else:
urls.add(link)
@@ -701,7 +704,10 @@ def get_specs(force=False, use_arch=False):
url_util.join(fetch_url_build_cache, 'index.html'))
for link in links:
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)
else:
urls.add(link)