diff options
| author | Todd Gamblin <tgamblin@llnl.gov> | 2019-01-13 14:29:07 -0800 |
|---|---|---|
| committer | Todd Gamblin <tgamblin@llnl.gov> | 2019-01-13 14:29:07 -0800 |
| commit | efa381c256b2267770c9bc3e4e2c6b691beb8042 (patch) | |
| tree | 947a377119a2040f07c14cef84e5422b8b5ccf78 | |
| parent | 42962f2409fe7b46543dc5974c45bb6392fcea99 (diff) | |
| parent | 4a7e3dcedd29703c17adb0f7bf1f1c2ee4be0e08 (diff) | |
| download | spack-efa381c256b2267770c9bc3e4e2c6b691beb8042.tar.gz spack-efa381c256b2267770c9bc3e4e2c6b691beb8042.tar.bz2 spack-efa381c256b2267770c9bc3e4e2c6b691beb8042.tar.xz spack-efa381c256b2267770c9bc3e4e2c6b691beb8042.zip | |
Merge branch 'releases/v0.12'v0.12.1
| -rw-r--r-- | lib/spack/docs/tutorial_basics.rst | 2 | ||||
| -rw-r--r-- | lib/spack/spack/__init__.py | 2 | ||||
| -rw-r--r-- | lib/spack/spack/binary_distribution.py | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/lib/spack/docs/tutorial_basics.rst b/lib/spack/docs/tutorial_basics.rst index 50c072c08e..ce8ee10dcf 100644 --- a/lib/spack/docs/tutorial_basics.rst +++ b/lib/spack/docs/tutorial_basics.rst @@ -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 diff --git a/lib/spack/spack/__init__.py b/lib/spack/spack/__init__.py index 848dc4f670..eeef81ca2d 100644 --- a/lib/spack/spack/__init__.py +++ b/lib/spack/spack/__init__.py @@ -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) diff --git a/lib/spack/spack/binary_distribution.py b/lib/spack/spack/binary_distribution.py index ced7447db6..f5362d637f 100644 --- a/lib/spack/spack/binary_distribution.py +++ b/lib/spack/spack/binary_distribution.py @@ -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: |