Merge branch '1.4.x'

Conflicts:
	debian/bcfg2-server.install
	doc/server/plugins/grouping/metadata.txt
	src/lib/Bcfg2/Client/Client.py
	src/lib/Bcfg2/Client/Tools/Portage.py
	src/lib/Bcfg2/Client/Tools/RcUpdate.py
	src/lib/Bcfg2/Client/Tools/YUM24.py
	src/lib/Bcfg2/Client/Tools/__init__.py
	src/lib/Bcfg2/Client/Tools/launchd.py
	src/lib/Bcfg2/Options.py
	src/lib/Bcfg2/Server/Core.py
	src/lib/Bcfg2/Server/Plugin/helpers.py
	src/lib/Bcfg2/Server/Plugins/Metadata.py
	src/lib/Bcfg2/Server/models.py
	src/lib/Bcfg2/Utils.py
	src/sbin/bcfg2-info
	src/sbin/bcfg2-test
	testsuite/Testsrc/Testlib/TestClient/TestTools/Test_init.py
	testsuite/Testsrc/test_code_checks.py

1 files changed, 7 insertions, 6 deletions

diff --git a/src/lib/Bcfg2/Server/Plugins/Git.py b/src/lib/Bcfg2/Server/Plugins/Git.py
index c8362db41..781413e1a 100644
--- a/src/lib/Bcfg2/Server/Plugins/Git.py
+++ b/src/lib/Bcfg2/Server/Plugins/Git.py
@@ -3,12 +3,12 @@ git. """
 
 import sys
 from Bcfg2.Server.Plugin import Version, PluginExecutionError
-from subprocess import Popen, PIPE
 
 try:
     import git
     HAS_GITPYTHON = True
 except ImportError:
+    from Bcfg2.Utils import Executor
     HAS_GITPYTHON = False
 
 
@@ -24,10 +24,12 @@ class Git(Version):
         Version.__init__(self, core, datastore)
         if HAS_GITPYTHON:
             self.repo = git.Repo(self.vcs_root)
+            self.cmd = None
         else:
             self.logger.debug("Git: GitPython not found, using CLI interface "
                               "to Git")
             self.repo = None
+            self.cmd = Executor()
         self.logger.debug("Initialized git plugin with git directory %s" %
                           self.vcs_path)
 
@@ -45,11 +47,10 @@ class Git(Version):
                 cmd = ["git", "--git-dir", self.vcs_path,
                        "--work-tree", self.vcs_root, "rev-parse", "HEAD"]
                 self.debug_log("Git: Running cmd")
-                proc = Popen(cmd, stdout=PIPE, stderr=PIPE)
-                rv, err = proc.communicate()
-                if proc.wait():
-                    raise Exception(err)
-                return rv
+                result = self.cmd.run(cmd)
+                if not result.success:
+                    raise Exception(result.stderr)
+                return result.stdout
         except:
             raise PluginExecutionError("Git: Error getting revision from %s: "
                                        "%s" % (self.vcs_root,