Skip to content
Snippets Groups Projects
Commit efa381c2 authored by Todd Gamblin's avatar Todd Gamblin
Browse files

Merge branch 'releases/v0.12'

parents 42962f24 4a7e3dce
No related branches found
Tags v0.12.1
No related merge requests found
......@@ -1635,7 +1635,7 @@ added to the configuration.
.. code-block:: console
$ spack install gcc
$ spack install gcc @7.2.0
==> libsigsegv is already installed in /home/spack1/spack/opt/spack/linux-ubuntu16.04-x86_64/gcc-5.4.0/libsigsegv-2.11-fypapcprssrj3nstp6njprskeyynsgaz
==> m4 is already installed in /home/spack1/spack/opt/spack/linux-ubuntu16.04-x86_64/gcc-5.4.0/m4-1.4.18-suf5jtcfehivwfesrc5hjy72r4nukyel
==> pkgconf is already installed in /home/spack1/spack/opt/spack/linux-ubuntu16.04-x86_64/gcc-5.4.0/pkgconf-1.4.2-fovrh7alpft646n6mhis5mml6k6e5f4v
......
......@@ -5,7 +5,7 @@
#: major, minor, patch version for Spack, in a tuple
spack_version_info = (0, 12, 0)
spack_version_info = (0, 12, 1)
#: String containing Spack version joined with .'s
spack_version = '.'.join(str(v) for v in spack_version_info)
......
......@@ -585,14 +585,14 @@ def get_keys(install=False, trust=False, force=False):
tty.msg("Finding public keys in %s" % mirror)
files = os.listdir(mirror)
for file in files:
if re.search('\.key', file):
if re.search(r'\.key', file):
link = 'file://' + mirror + '/' + file
keys.add(link)
else:
tty.msg("Finding public keys on %s" % url)
p, links = spider(url + "/build_cache", depth=1)
for link in links:
if re.search("\.key", link):
if re.search(r'\.key', link):
keys.add(link)
for link in keys:
with Stage(link, name="build_cache", keep=True) as stage:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment