From db43746be3227e9342bc0ab870079ed3167eb324 Mon Sep 17 00:00:00 2001 From: "Chris St. Pierre" Date: Fri, 5 Aug 2011 10:14:27 -0400 Subject: made packages.conf optional --- src/lib/Server/Plugins/Packages.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/lib/Server/Plugins/Packages.py b/src/lib/Server/Plugins/Packages.py index 9ae6cf2b5..a4fb713d4 100644 --- a/src/lib/Server/Plugins/Packages.py +++ b/src/lib/Server/Plugins/Packages.py @@ -784,7 +784,11 @@ class PackagesConfig(Bcfg2.Server.Plugin.FileBacked, def __init__(self, filename, fam): Bcfg2.Server.Plugin.FileBacked.__init__(self, filename) ConfigParser.SafeConfigParser.__init__(self) - fam.AddMonitor(filename, self) + # packages.conf isn't strictly necessary, so only set a + # monitor if it exists. if it gets added, that will require a + # server restart + if os.path.exists(filename): + fam.AddMonitor(filename, self) def Index(self): """ Build local data structures """ -- cgit v1.2.3-1-g7c22 From 3a1f04c49cf13f0740ec6f13f21209c6445fd4a6 Mon Sep 17 00:00:00 2001 From: "Chris St. Pierre" Date: Fri, 5 Aug 2011 10:17:10 -0400 Subject: fixed bcfg2-admin viz bug introduced by Popen fixes --- src/lib/Server/Admin/Viz.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/lib/Server/Admin/Viz.py b/src/lib/Server/Admin/Viz.py index 9b1e78821..2d9b4ade2 100644 --- a/src/lib/Server/Admin/Viz.py +++ b/src/lib/Server/Admin/Viz.py @@ -1,7 +1,7 @@ import getopt from subprocess import Popen, PIPE import sys - +import pipes import Bcfg2.Server.Admin @@ -86,10 +86,11 @@ class Viz(Bcfg2.Server.Admin.MetadataCore): else: format = 'png' - cmd = ["dot", "-T", format] + cmd = ["dot", "-T", pipes.quote(format)] if output: - cmd.extend(["-o", output]) - dotpipe = Popen(cmd, stdin=PIPE, stdout=PIPE, close_fds=True) + 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: -- cgit v1.2.3-1-g7c22