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, 26 insertions, 35 deletions

diff --git a/src/lib/Bcfg2/Server/Admin/Viz.py b/src/lib/Bcfg2/Server/Admin/Viz.py
index 1d9d25f16..cdd8fd0cb 100644
--- a/src/lib/Bcfg2/Server/Admin/Viz.py
+++ b/src/lib/Bcfg2/Server/Admin/Viz.py
@@ -1,10 +1,8 @@
 """ Produce graphviz diagrams of metadata structures """
 
 import getopt
-from subprocess import Popen, PIPE
-import pipes
 import Bcfg2.Server.Admin
-
+from Bcfg2.Utils import Executor
 
 class Viz(Bcfg2.Server.Admin.MetadataCore):
     """ Produce graphviz diagrams of metadata structures """
@@ -29,10 +27,9 @@ class Viz(Bcfg2.Server.Admin.MetadataCore):
               'indianred1', 'limegreen', 'orange1', 'lightblue2',
               'green1', 'blue1', 'yellow1', 'darkturquoise', 'gray66']
 
-    __plugin_blacklist__ = ['DBStats', 'Snapshots', 'Cfg', 'Pkgmgr',
-                            'Packages', 'Rules', 'Account', 'Decisions',
-                            'Deps', 'Git', 'Svn', 'Fossil', 'Bzr', 'Bundler',
-                            'TGenshi', 'Base']
+    __plugin_blacklist__ = ['DBStats', 'Cfg', 'Pkgmgr',
+                            'Packages', 'Rules', 'Decisions',
+                            'Deps', 'Git', 'Svn', 'Fossil', 'Bzr', 'Bundler']
 
     def __call__(self, args):
         # First get options to the 'viz' subcommand
@@ -73,40 +70,34 @@ class Viz(Bcfg2.Server.Admin.MetadataCore):
         else:
             fmt = 'png'
 
+        exc = Executor()
         cmd = ["dot", "-T", fmt]
         if output:
             cmd.extend(["-o", output])
+        idata = ["digraph groups {",
+                 '\trankdir="LR";',
+                 self.metadata.viz(hosts, bundles,
+                                   key, only_client, self.colors)]
+        if key:
+            idata.extend([
+                    "\tsubgraph cluster_key {",
+                    '\tstyle="filled";',
+                    '\tcolor="lightblue";',
+                    '\tBundle [ shape="septagon" ];',
+                    '\tGroup [shape="ellipse"];',
+                    '\tProfile [style="bold", shape="ellipse"];',
+                    '\tHblock [label="Host1|Host2|Host3",shape="record"];',
+                    '\tlabel="Key";',
+                    "\t}"])
+        idata.append("}")
         try:
-            dotpipe = Popen(cmd, stdin=PIPE, stdout=PIPE, close_fds=True)
+            result = exc.run(cmd, inputdata=idata)
         except OSError:
             # on some systems (RHEL 6), you cannot run dot with
             # shell=True.  on others (Gentoo with Python 2.7), you
             # must.  In yet others (RHEL 5), either way works.  I have
             # no idea what the difference is, but it's kind of a PITA.
-            cmd = ["dot", "-T", pipes.quote(fmt)]
-            if output:
-                cmd.extend(["-o", pipes.quote(output)])
-            dotpipe = Popen(cmd, shell=True,
-                            stdin=PIPE, stdout=PIPE, close_fds=True)
-        try:
-            dotpipe.stdin.write("digraph groups {\n")
-        except:
-            print("write to dot process failed. Is graphviz installed?")
-            raise SystemExit(1)
-        dotpipe.stdin.write('\trankdir="LR";\n')
-        dotpipe.stdin.write(self.metadata.viz(hosts, bundles,
-                                              key, only_client, self.colors))
-        if key:
-            dotpipe.stdin.write("\tsubgraph cluster_key {\n")
-            dotpipe.stdin.write('\tstyle="filled";\n')
-            dotpipe.stdin.write('\tcolor="lightblue";\n')
-            dotpipe.stdin.write('\tBundle [ shape="septagon" ];\n')
-            dotpipe.stdin.write('\tGroup [shape="ellipse"];\n')
-            dotpipe.stdin.write('\tProfile [style="bold", shape="ellipse"];\n')
-            dotpipe.stdin.write('\tHblock [label="Host1|Host2|Host3", '
-                                'shape="record"];\n')
-            dotpipe.stdin.write('\tlabel="Key";\n')
-            dotpipe.stdin.write("\t}\n")
-        dotpipe.stdin.write("}\n")
-        dotpipe.stdin.close()
-        return dotpipe.stdout.read()
+            result = exc.run(cmd, shell=True, inputdata=idata)
+        if not result.success:
+            print("Error running %s: %s" % (cmd, result.error))
+            raise SystemExit(result.retval)