use Executor class for better subprocess calling on server

1 files changed, 9 insertions, 9 deletions

diff --git a/src/lib/Bcfg2/Server/Lint/Validate.py b/src/lib/Bcfg2/Server/Lint/Validate.py
index 7a9d9f877..dd45ac62e 100644
--- a/src/lib/Bcfg2/Server/Lint/Validate.py
+++ b/src/lib/Bcfg2/Server/Lint/Validate.py
@@ -5,8 +5,8 @@ import sys
 import glob
 import fnmatch
 import lxml.etree
-from subprocess import Popen, PIPE, STDOUT
 import Bcfg2.Server.Lint
+from Bcfg2.Utils import Executor
 
 
 class Validate(Bcfg2.Server.Lint.ServerlessPlugin):
@@ -44,6 +44,7 @@ class Validate(Bcfg2.Server.Lint.ServerlessPlugin):
 
         self.filelists = {}
         self.get_filelists()
+        self.cmd = Executor()
 
     def Run(self):
         schemadir = self.config['schema']
@@ -94,11 +95,10 @@ class Validate(Bcfg2.Server.Lint.ServerlessPlugin):
         try:
             datafile = lxml.etree.parse(filename)
         except SyntaxError:
-            lint = Popen(["xmllint", filename], stdout=PIPE, stderr=STDOUT)
+            result = self.cmd.run(["xmllint", filename])
             self.LintError("xml-failed-to-parse",
-                           "%s fails to parse:\n%s" % (filename,
-                                                       lint.communicate()[0]))
-            lint.wait()
+                           "%s fails to parse:\n%s" %
+                           (filename, result.stdout + result.stderr))
             return False
         except IOError:
             self.LintError("xml-failed-to-read",
@@ -110,11 +110,11 @@ class Validate(Bcfg2.Server.Lint.ServerlessPlugin):
             if self.files is None:
                 cmd.append("--xinclude")
             cmd.extend(["--noout", "--schema", schemafile, filename])
-            lint = Popen(cmd, stdout=PIPE, stderr=STDOUT)
-            output = lint.communicate()[0]
-            if lint.wait():
+            result = self.cmd.run(cmd)
+            if not result.success:
                 self.LintError("xml-failed-to-verify",
-                               "%s fails to verify:\n%s" % (filename, output))
+                               "%s fails to verify:\n%s" %
+                               (filename, result.stdout + result.stderr))
                 return False
         return True