hlrs-software-stack/spack
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

bugfix: spack -V should use working_dir() instead of git -C

Browse source 
- `git -C` doesn't work on git before 1.8.5
- `working_dir` gets us the same effect
This commit is contained in:
Todd Gamblin 2020-02-11 14:16:40 -08:00
parent 582e7ce2c8
commit c56c4b334d
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/spack/spack/main.py
View file

@ -22,6 +22,7 @@
from six import StringIO from six import StringIO
import llnl.util.cpu import llnl.util.cpu
import llnl.util.filesystem as fs
import llnl.util.tty as tty import llnl.util.tty as tty
import llnl.util.tty.color as color import llnl.util.tty.color as color
from llnl.util.tty.log import log_output from llnl.util.tty.log import log_output
@ -125,8 +126,9 @@ def get_version():
if os.path.exists(git_path): if os.path.exists(git_path):
git = exe.which("git") git = exe.which("git")
if git: if git:
desc = git("-C", spack.paths.prefix, "describe", "--tags", with fs.working_dir(spack.paths.prefix):
output=str, fail_on_error=False) desc = git(
"describe", "--tags", output=str, fail_on_error=False)
if git.returncode == 0: if git.returncode == 0:
match = re.match(r"v([^-]+)-([^-]+)-g([a-f\d]+)", desc) match = re.match(r"v([^-]+)-([^-]+)-g([a-f\d]+)", desc)