diff options
| author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2012-05-11 13:27:07 -0400 |
|---|---|---|
| committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2012-05-11 13:27:17 -0400 |
| commit | afeeb2b6430875cc3979ae4ad690d2a3efc0ac68 (patch) | |
| tree | 8e68a03334c5f21cd0974c757b49ef75413d1c18 /src/sbin/bcfg2-lint | |
| parent | c5b4bfd842a6f03a4c840cd32c3a99bcc57a8c48 (diff) | |
| download | bcfg2-afeeb2b6430875cc3979ae4ad690d2a3efc0ac68.tar.gz bcfg2-afeeb2b6430875cc3979ae4ad690d2a3efc0ac68.tar.bz2 bcfg2-afeeb2b6430875cc3979ae4ad690d2a3efc0ac68.zip | |
moved plugin-specific configs to main config file; propagate "setup" object to server Core
Diffstat (limited to 'src/sbin/bcfg2-lint')
| -rwxr-xr-x | src/sbin/bcfg2-lint | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/sbin/bcfg2-lint b/src/sbin/bcfg2-lint index 5ee88535d..78b833f02 100755 --- a/src/sbin/bcfg2-lint +++ b/src/sbin/bcfg2-lint @@ -62,7 +62,9 @@ def get_errorhandler(config): def load_server(setup): """ load server """ core = Bcfg2.Server.Core.Core(setup['repo'], setup['plugins'], - setup['password'], setup['encoding']) + setup['password'], setup['encoding'], + filemonitor=setup['filemonitor'], + setup=setup) if setup['event debug']: core.fam.debug = True core.fam.handle_events_in_interval(4) @@ -73,8 +75,6 @@ if __name__ == '__main__': 'configfile': Bcfg2.Options.CFILE, 'help': Bcfg2.Options.HELP, 'verbose': Bcfg2.Options.VERBOSE, - } - optinfo.update({ 'event debug': Bcfg2.Options.DEBUG, 'encoding': Bcfg2.Options.ENCODING, # Server options @@ -101,7 +101,7 @@ if __name__ == '__main__': 'showerrors': Bcfg2.Options.Option('Show error handling', False, cmd='--list-errors', long_arg=True), - }) + } setup = Bcfg2.Options.OptionParser(optinfo) setup.parse(sys.argv[1:]) |