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

Allow buildcaches keys to find public keys on the e4s mirror (#15361)

Browse Source
This commit is contained in:
Patrick Gartung 2020-03-05 15:15:40 -06:00 committed by GitHub
parent 28a75a4c35
commit 820d147e08
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -802,6 +802,7 @@ def get_specs(force=False, allarch=False):
def get_keys(install=False, trust=False, force=False): def get_keys(install=False, trust=False, force=False):
""" """
Get pgp public keys available on mirror Get pgp public keys available on mirror
with suffix .key or .pub
""" """
if not spack.mirror.MirrorCollection(): if not spack.mirror.MirrorCollection():
tty.die("Please add a spack mirror to allow " + tty.die("Please add a spack mirror to allow " +
@ -818,16 +819,18 @@ def get_keys(install=False, trust=False, force=False):
tty.msg("Finding public keys in %s" % mirror_dir) tty.msg("Finding public keys in %s" % mirror_dir)
files = os.listdir(mirror_dir) files = os.listdir(mirror_dir)
for file in files: for file in files:
if re.search(r'\.key', file): if re.search(r'\.key', file) or re.search(r'\.pub', file):
link = url_util.join(fetch_url_build_cache, file) link = url_util.join(fetch_url_build_cache, file)
keys.add(link) keys.add(link)
else: else:
tty.msg("Finding public keys at %s" % tty.msg("Finding public keys at %s" %
url_util.format(fetch_url_build_cache)) url_util.format(fetch_url_build_cache))
p, links = web_util.spider(fetch_url_build_cache, depth=1) # For s3 mirror need to request index.html directly
p, links = web_util.spider(
url_util.join(fetch_url_build_cache, 'index.html'), depth=1)
for link in links: for link in links:
if re.search(r'\.key', link): if re.search(r'\.key', link) or re.search(r'\.pub', link):
keys.add(link) keys.add(link)
for link in keys: for link in keys: