use Executor class for better subprocess calling on server

1 files changed, 8 insertions, 12 deletions

diff --git a/src/lib/Bcfg2/Server/Plugins/Darcs.py b/src/lib/Bcfg2/Server/Plugins/Darcs.py
index 0033e00f3..2c6dde393 100644
--- a/src/lib/Bcfg2/Server/Plugins/Darcs.py
+++ b/src/lib/Bcfg2/Server/Plugins/Darcs.py
@@ -1,7 +1,7 @@
 """ Darcs is a version plugin for dealing with Bcfg2 repos stored in the
 Darcs VCS. """
 
-from subprocess import Popen, PIPE
+from Bcfg2.Utils import Executor
 import Bcfg2.Server.Plugin
 
 
@@ -13,21 +13,17 @@ class Darcs(Bcfg2.Server.Plugin.Version):
 
     def __init__(self, core, datastore):
         Bcfg2.Server.Plugin.Version.__init__(self, core, datastore)
+        self.cmd = Executor()
         self.logger.debug("Initialized Darcs plugin with darcs directory %s" %
                           self.vcs_path)
 
     def get_revision(self):
         """Read Darcs changeset information for the Bcfg2 repository."""
-        try:
-            data = Popen("env LC_ALL=C darcs changes",
-                        shell=True,
-                        cwd=self.vcs_root,
-                        stdout=PIPE).stdout.readlines()
-            revision = data[0].strip('\n')
-        except:
-            msg = "Failed to read darcs repository"
+        result = self.cmd.run(["env LC_ALL=C", "darcs", "changes"],
+                              shell=True, cwd=self.vcs_root)
+        if result.success:
+            return result.stdout.splitlines()[0].strip()
+        else:
+            msg = "Failed to read revision from darcs: %s" % result.error
             self.logger.error(msg)
-            self.logger.error('Ran command "darcs changes" from directory %s' %
-                              self.vcs_root)
             raise Bcfg2.Server.Plugin.PluginExecutionError(msg)
-        return revision