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

Follow the example of spack arch (#14642)

Browse Source
This commit is contained in:
Patrick Gartung
2020-01-27 20:04:48 -06:00
committed by GitHub
parent e01c39019c
commit d0523ca087
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/spack/spack/binary_distribution.py
View File

@@ -33,6 +33,7 @@
from spack.spec import Spec from spack.spec import Spec
from spack.stage import Stage from spack.stage import Stage
from spack.util.gpg import Gpg from spack.util.gpg import Gpg
import spack.architecture as architecture
_build_cache_relative_path = 'build_cache' _build_cache_relative_path = 'build_cache'
@@ -669,6 +670,9 @@ def get_specs(force=False, use_arch=False):
""" """
global _cached_specs global _cached_specs
arch = architecture.Arch(architecture.platform(),
'default_os', 'default_target')
if _cached_specs: if _cached_specs:
tty.debug("Using previously-retrieved specs") tty.debug("Using previously-retrieved specs")
return _cached_specs return _cached_specs
@@ -691,8 +695,8 @@ def get_specs(force=False, use_arch=False):
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('%s-%s' % if use_arch and re.search('%s-%s' %
(spack.architecture.platform, (arch.platform,
spack.architecture.os), arch.os),
file): file):
urls.add(link) urls.add(link)
else: else:
@@ -705,8 +709,8 @@ def get_specs(force=False, use_arch=False):
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('%s-%s' % if use_arch and re.search('%s-%s' %
(spack.architecture.platform, (arch.platform,
spack.architecture.os), arch.os),
link): link):
urls.add(link) urls.add(link)
else: else: