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

pkg command uses a working directory for git invocations rather than -C. (#12491)

Browse Source
This commit is contained in:
Chris Green 2019-08-21 11:31:27 -05:00 committed by Todd Gamblin
parent 3b115fffb1
commit 2441c0bad7
1 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
lib/spack/spack/cmd/pkg.py
View File

@ -11,6 +11,7 @@
import llnl.util.tty as tty import llnl.util.tty as tty
from llnl.util.tty.colify import colify from llnl.util.tty.colify import colify
from llnl.util.filesystem import working_dir
import spack.cmd import spack.cmd
import spack.paths import spack.paths
@ -79,12 +80,28 @@ def packages_path():
return spack.repo.path.get_repo('builtin').packages_path return spack.repo.path.get_repo('builtin').packages_path
class GitExe:
# Wrapper around Executable for git to set working directory for all
# invocations.
#
# Not using -C as that is not supported for git < 1.8.5.
def __init__(self):
self._git_cmd = which('git', required=True)
def __call__(self, *args, **kwargs):
with working_dir(packages_path()):
return self._git_cmd(*args, **kwargs)
_git = None
def get_git(): def get_git():
"""Get a git executable that runs *within* the packages path.""" """Get a git executable that runs *within* the packages path."""
git = which('git', required=True) global _git
git.add_default_arg('-C') if _git is None:
git.add_default_arg(packages_path()) _git = GitExe()
return git return _git
def list_packages(rev): def list_packages(rev):
@ -102,13 +119,14 @@ def list_packages(rev):
def pkg_add(args): def pkg_add(args):
"""add a package to the git stage with `git add`""" """add a package to the git stage with `git add`"""
git = get_git()
for pkg_name in args.packages: for pkg_name in args.packages:
filename = spack.repo.path.filename_for_package_name(pkg_name) filename = spack.repo.path.filename_for_package_name(pkg_name)
if not os.path.isfile(filename): if not os.path.isfile(filename):
tty.die("No such package: %s. Path does not exist:" % tty.die("No such package: %s. Path does not exist:" %
pkg_name, filename) pkg_name, filename)
git = get_git()
git('add', filename) git('add', filename)