summaryrefslogtreecommitdiffstats
path: root/src/lib/Bcfg2/Server
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/Bcfg2/Server')
-rw-r--r--src/lib/Bcfg2/Server/Admin/__init__.py3
-rw-r--r--src/lib/Bcfg2/Server/Core.py2
2 files changed, 1 insertions, 4 deletions
diff --git a/src/lib/Bcfg2/Server/Admin/__init__.py b/src/lib/Bcfg2/Server/Admin/__init__.py
index 618fa450e..a7269a289 100644
--- a/src/lib/Bcfg2/Server/Admin/__init__.py
+++ b/src/lib/Bcfg2/Server/Admin/__init__.py
@@ -123,9 +123,8 @@ class MetadataCore(Mode):
setup['password'],
setup['encoding'],
filemonitor=setup['filemonitor'],
+ cfile=setup['configfile'],
setup=setup)
- if setup['event debug']:
- self.bcore.fam.debug = True
except Bcfg2.Server.Core.CoreInitError:
msg = sys.exc_info()[1]
self.errExit("Core load failed: %s" % msg)
diff --git a/src/lib/Bcfg2/Server/Core.py b/src/lib/Bcfg2/Server/Core.py
index c8ef5b1f7..898d5e20e 100644
--- a/src/lib/Bcfg2/Server/Core.py
+++ b/src/lib/Bcfg2/Server/Core.py
@@ -79,8 +79,6 @@ class Core(Component):
famargs['ignore'] = setup['ignore']
if 'debug' in setup:
famargs['debug'] = setup['debug']
- elif 'event debug' in setup:
- famargs['debug'] = setup['event debug']
try:
self.fam = fm(**famargs)
except IOError: