From ea5110cf629a4547070ff747bafe3cfae5233cd1 Mon Sep 17 00:00:00 2001 From: "Chris St. Pierre" Date: Fri, 2 Nov 2012 13:00:39 -0400 Subject: fixed git plugin interface to git commands --- src/lib/Bcfg2/Server/Plugins/Git.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src/lib/Bcfg2/Server/Plugins/Git.py') diff --git a/src/lib/Bcfg2/Server/Plugins/Git.py b/src/lib/Bcfg2/Server/Plugins/Git.py index b7269af48..5faa6c018 100644 --- a/src/lib/Bcfg2/Server/Plugins/Git.py +++ b/src/lib/Bcfg2/Server/Plugins/Git.py @@ -92,7 +92,8 @@ except ImportError: """ API for :class:`Git` using subprocess to run git commands """ def revision(self): - proc = Popen(["git", "--work-tree", self.path, + proc = Popen(["git", "--work-tree", + os.path.join(self.path, ".git"), "rev-parse", "HEAD"], stdout=PIPE, stderr=PIPE) rv, err = proc.communicate() @@ -102,7 +103,8 @@ except ImportError: return rv.strip() # pylint: disable=E1103 def pull(self): - proc = Popen(["git", "--work-tree", self.path, + proc = Popen(["git", "--work-tree", + os.path.join(self.path, ".git"), "pull", "--rebase"], stdout=PIPE, stderr=PIPE) err = proc.communicate()[1].strip() -- cgit v1.2.3-1-g7c22