diff options
author | Todd Gamblin <tgamblin@llnl.gov> | 2020-08-05 17:01:18 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-08-05 17:01:18 -0700 |
commit | 9dbe1d77761eb9f98d9f18f8ff7919053c0a2b0c (patch) | |
tree | a22927f2fce254d14150c163f230bc999ddab347 /lib | |
parent | aee95fe9a95413b5e4a3843f6b9c3f940482d978 (diff) | |
download | spack-9dbe1d77761eb9f98d9f18f8ff7919053c0a2b0c.tar.gz spack-9dbe1d77761eb9f98d9f18f8ff7919053c0a2b0c.tar.bz2 spack-9dbe1d77761eb9f98d9f18f8ff7919053c0a2b0c.tar.xz spack-9dbe1d77761eb9f98d9f18f8ff7919053c0a2b0c.zip |
bugfix: fix spack -V with releases/latest and shallow clones (#17884)
`spack -V` stopped working when we added the `releases/latest` tag to
track the most recent release. It started just reporting the version,
even on a `develop` checkout. We need to tell it to *only* search for
tags that start with `v`, so that it will ignore `releases/latest`.
`spack -V` also would print out unwanted git eror output on a shallow
clone.
- [x] add `--match 'v*'` to `git describe` arguments
- [x] route error output to `os.devnull`
Diffstat (limited to 'lib')
-rw-r--r-- | lib/spack/spack/main.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/spack/spack/main.py b/lib/spack/spack/main.py index 1bab26c2e1..d19578007b 100644 --- a/lib/spack/spack/main.py +++ b/lib/spack/spack/main.py @@ -128,8 +128,8 @@ def get_version(): git = exe.which("git") if git: with fs.working_dir(spack.paths.prefix): - desc = git( - "describe", "--tags", output=str, fail_on_error=False) + desc = git("describe", "--tags", "--match", "v*", + output=str, error=os.devnull, fail_on_error=False) if git.returncode == 0: match = re.match(r"v([^-]+)-([^-]+)-g([a-f\d]+)", desc) |