summaryrefslogtreecommitdiffstats
path: root/src/lib/Bcfg2
diff options
context:
space:
mode:
authorChris St. Pierre <chris.a.st.pierre@gmail.com>2012-08-14 07:53:43 -0400
committerChris St. Pierre <chris.a.st.pierre@gmail.com>2012-08-14 07:53:43 -0400
commitf8f62180e36ccc846315e309b62d17e732a3148f (patch)
treef67541041043dd912205286929d825ff511e6a20 /src/lib/Bcfg2
parent9f27d18c1bc14a570f40a77b0c97373e6ab58431 (diff)
downloadbcfg2-f8f62180e36ccc846315e309b62d17e732a3148f.tar.gz
bcfg2-f8f62180e36ccc846315e309b62d17e732a3148f.tar.bz2
bcfg2-f8f62180e36ccc846315e309b62d17e732a3148f.zip
fixed test inheritance
Diffstat (limited to 'src/lib/Bcfg2')
-rw-r--r--src/lib/Bcfg2/Server/Plugin.py9
1 files changed, 3 insertions, 6 deletions
diff --git a/src/lib/Bcfg2/Server/Plugin.py b/src/lib/Bcfg2/Server/Plugin.py
index cb6d41fb3..424594de8 100644
--- a/src/lib/Bcfg2/Server/Plugin.py
+++ b/src/lib/Bcfg2/Server/Plugin.py
@@ -654,6 +654,7 @@ class XMLFileBacked(FileBacked):
if fpath not in self.extras:
if os.path.exists(fpath):
self._follow_xincludes(fname=fpath)
+ print "adding monitor to %s" % fpath
self.add_monitor(fpath)
else:
msg = "%s: %s does not exist, skipping" % (self.name, name)
@@ -918,11 +919,7 @@ class PrioDir(Plugin, Generator, XMLDirectoryBacked):
def __init__(self, core, datastore):
Plugin.__init__(self, core, datastore)
Generator.__init__(self)
- try:
- XMLDirectoryBacked.__init__(self, self.data, self.core.fam)
- except OSError:
- self.logger.error("Failed to load %s indices" % (self.name))
- raise PluginInitError
+ XMLDirectoryBacked.__init__(self, self.data, self.core.fam)
def HandleEvent(self, event):
"""Handle events and update dispatch table."""
@@ -1253,7 +1250,7 @@ class GroupSpool(Plugin, Generator):
for entry in self.entries.values():
if hasattr(entry, "toggle_debug"):
entry.toggle_debug()
- return Plugin.toggle_debug()
+ return Plugin.toggle_debug(self)
def HandleEvent(self, event):
"""Unified FAM event handler for GroupSpool."""