diff options
author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2012-05-21 15:19:03 -0400 |
---|---|---|
committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2012-05-21 15:19:03 -0400 |
commit | 1a43d45badb0c5127b75dfef436bd45af5ed916c (patch) | |
tree | b8de6ab35e2275cae17ce6e89c3c7087b997c237 /src/lib/Bcfg2/Server | |
parent | 5bdcf1ce5fb01aeca47d36f5b96924182c950869 (diff) | |
download | bcfg2-1a43d45badb0c5127b75dfef436bd45af5ed916c.tar.gz bcfg2-1a43d45badb0c5127b75dfef436bd45af5ed916c.tar.bz2 bcfg2-1a43d45badb0c5127b75dfef436bd45af5ed916c.zip |
added option groups
Diffstat (limited to 'src/lib/Bcfg2/Server')
-rw-r--r-- | src/lib/Bcfg2/Server/Admin/__init__.py | 3 | ||||
-rw-r--r-- | src/lib/Bcfg2/Server/Core.py | 2 |
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: |