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, 11 insertions, 21 deletions

diff --git a/src/lib/Bcfg2/Server/Plugins/PuppetENC.py b/src/lib/Bcfg2/Server/Plugins/PuppetENC.py
index 801e7006d..3b367573b 100644
--- a/src/lib/Bcfg2/Server/Plugins/PuppetENC.py
+++ b/src/lib/Bcfg2/Server/Plugins/PuppetENC.py
@@ -4,7 +4,7 @@ import os
 import sys
 import Bcfg2.Server
 import Bcfg2.Server.Plugin
-from subprocess import Popen, PIPE
+from Bcfg2.Utils import Executor
 
 try:
     from syck import load as yaml_load, error as yaml_error
@@ -28,16 +28,15 @@ class PuppetENC(Bcfg2.Server.Plugin.Plugin,
                 Bcfg2.Server.Plugin.DirectoryBacked):
     """ A plugin to run Puppet external node classifiers
     (http://docs.puppetlabs.com/guides/external_nodes.html) """
-    experimental = True
     __child__ = PuppetENCFile
 
     def __init__(self, core, datastore):
         Bcfg2.Server.Plugin.Plugin.__init__(self, core, datastore)
         Bcfg2.Server.Plugin.Connector.__init__(self)
         Bcfg2.Server.Plugin.ClientRunHooks.__init__(self)
-        Bcfg2.Server.Plugin.DirectoryBacked.__init__(self, self.data,
-                                                     self.core.fam)
+        Bcfg2.Server.Plugin.DirectoryBacked.__init__(self, self.data)
         self.cache = dict()
+        self.cmd = Executor()
 
     def _run_encs(self, metadata):
         """ Run all Puppet ENCs """
@@ -46,20 +45,17 @@ class PuppetENC(Bcfg2.Server.Plugin.Plugin,
             epath = os.path.join(self.data, enc)
             self.debug_log("PuppetENC: Running ENC %s for %s" %
                            (enc, metadata.hostname))
-            proc = Popen([epath, metadata.hostname], stdin=PIPE, stdout=PIPE,
-                         stderr=PIPE)
-            (out, err) = proc.communicate()
-            rv = proc.wait()
-            if rv != 0:
-                msg = "PuppetENC: Error running ENC %s for %s (%s): %s" % \
-                    (enc, metadata.hostname, rv, err)
+            result = self.cmd.run([epath, metadata.hostname])
+            if not result.success:
+                msg = "PuppetENC: Error running ENC %s for %s: %s" % \
+                    (enc, metadata.hostname, result.error)
                 self.logger.error(msg)
                 raise Bcfg2.Server.Plugin.PluginExecutionError(msg)
-            if err:
-                self.debug_log("ENC Error: %s" % err)
+            if result.stderr:
+                self.debug_log("ENC Error: %s" % result.stderr)
 
             try:
-                yaml = yaml_load(out)
+                yaml = yaml_load(result.stdout)
                 self.debug_log("Loaded data from %s for %s: %s" %
                                (enc, metadata.hostname, yaml))
             except yaml_error:
@@ -69,13 +65,7 @@ class PuppetENC(Bcfg2.Server.Plugin.Plugin,
                 self.logger.error(msg)
                 raise Bcfg2.Server.Plugin.PluginExecutionError(msg)
 
-            groups = dict()
-            if "classes" in yaml:
-                # stock Puppet ENC output format
-                groups = yaml['classes']
-            elif "groups" in yaml:
-                # more Bcfg2-ish output format
-                groups = yaml['groups']
+            groups = yaml.get("classes", yaml.get("groups", dict()))
             if groups:
                 if isinstance(groups, list):
                     self.debug_log("ENC %s adding groups to %s: %s" %