Merge branch '1.4.x'

Conflicts:
	debian/bcfg2-server.install
	doc/server/plugins/grouping/metadata.txt
	src/lib/Bcfg2/Client/Client.py
	src/lib/Bcfg2/Client/Tools/Portage.py
	src/lib/Bcfg2/Client/Tools/RcUpdate.py
	src/lib/Bcfg2/Client/Tools/YUM24.py
	src/lib/Bcfg2/Client/Tools/__init__.py
	src/lib/Bcfg2/Client/Tools/launchd.py
	src/lib/Bcfg2/Options.py
	src/lib/Bcfg2/Server/Core.py
	src/lib/Bcfg2/Server/Plugin/helpers.py
	src/lib/Bcfg2/Server/Plugins/Metadata.py
	src/lib/Bcfg2/Server/models.py
	src/lib/Bcfg2/Utils.py
	src/sbin/bcfg2-info
	src/sbin/bcfg2-test
	testsuite/Testsrc/Testlib/TestClient/TestTools/Test_init.py
	testsuite/Testsrc/test_code_checks.py

1 files changed, 20 insertions, 20 deletions

diff --git a/src/sbin/bcfg2-lint b/src/sbin/bcfg2-lint
index 430c4c54f..4f81df89c 100755
--- a/src/sbin/bcfg2-lint
+++ b/src/sbin/bcfg2-lint
@@ -13,37 +13,36 @@ import Bcfg2.Server.Lint
 LOGGER = logging.getLogger('bcfg2-lint')
 
 
-def run_serverless_plugins(plugins, setup=None, errorhandler=None, files=None):
+def run_serverless_plugins(plugins, errorhandler=None, files=None):
     """ Run serverless plugins """
     LOGGER.debug("Running serverless plugins")
     for plugin_name, plugin in list(plugins.items()):
-        run_plugin(plugin, plugin_name, errorhandler=errorhandler,
-                   setup=setup, files=files)
+        run_plugin(plugin, plugin_name, errorhandler=errorhandler, files=files)
 
 
-def run_server_plugins(plugins, setup=None, errorhandler=None, files=None):
+def run_server_plugins(plugins, errorhandler=None, files=None):
     """ run plugins that require a running server to run """
-    core = load_server(setup)
+    core = load_server()
     try:
         LOGGER.debug("Running server plugins")
         for plugin_name, plugin in list(plugins.items()):
             run_plugin(plugin, plugin_name, args=[core],
-                       errorhandler=errorhandler, setup=setup, files=files)
+                       errorhandler=errorhandler, files=files)
     finally:
         core.shutdown()
 
 
-def run_plugin(plugin, plugin_name, setup=None, errorhandler=None,
-               args=None, files=None):
+def run_plugin(plugin, plugin_name, errorhandler=None, args=None, files=None):
     """ run a single plugin, server-ful or serverless. """
     LOGGER.debug("  Running %s" % plugin_name)
     if args is None:
         args = []
 
     if errorhandler is None:
-        errorhandler = get_errorhandler(setup)
+        errorhandler = get_errorhandler()
 
-    if setup is not None and setup.cfp.has_section(plugin_name):
+    setup = Bcfg2.Options.get_option_parser()
+    if setup.cfp.has_section(plugin_name):
         arg = setup
         for key, val in setup.cfp.items(plugin_name):
             arg[key] = val
@@ -55,8 +54,9 @@ def run_plugin(plugin, plugin_name, setup=None, errorhandler=None,
     return plugin(*args, **dict(files=files, errorhandler=errorhandler)).Run()
 
 
-def get_errorhandler(setup):
+def get_errorhandler():
     """ get a Bcfg2.Server.Lint.ErrorHandler object """
+    setup = Bcfg2.Options.get_option_parser()
     if setup.cfp.has_section("errors"):
         conf = dict(setup.cfp.items("errors"))
     else:
@@ -64,9 +64,9 @@ def get_errorhandler(setup):
     return Bcfg2.Server.Lint.ErrorHandler(config=conf)
 
 
-def load_server(setup):
+def load_server():
     """ load server """
-    core = Bcfg2.Server.Core.BaseCore(setup)
+    core = Bcfg2.Server.Core.BaseCore()
     core.fam.handle_events_in_interval(4)
     return core
 
@@ -83,8 +83,9 @@ def load_plugin(module, obj_name=None):
     return getattr(mod, obj_name)
 
 
-def load_plugins(setup):
+def load_plugins():
     """ get list of plugins to run """
+    setup = Bcfg2.Options.get_option_parser()
     if setup['args']:
         plugin_list = setup['args']
     elif "bcfg2-repo-validate" in sys.argv[0]:
@@ -146,7 +147,7 @@ def main():
                    lint_plugins=Bcfg2.Options.LINT_PLUGINS)
     optinfo.update(Bcfg2.Options.CLI_COMMON_OPTIONS)
     optinfo.update(Bcfg2.Options.SERVER_COMMON_OPTIONS)
-    setup = Bcfg2.Options.OptionParser(optinfo)
+    setup = Bcfg2.Options.load_option_parser(optinfo)
     setup.parse(sys.argv[1:])
 
     log_args = dict(to_syslog=setup['syslog'], to_console=logging.WARNING)
@@ -162,9 +163,8 @@ def main():
     else:
         files = None
 
-    (serverlessplugins, serverplugins) = load_plugins(setup)
-
-    errorhandler = get_errorhandler(setup)
+    (serverlessplugins, serverplugins) = load_plugins()
+    errorhandler = get_errorhandler()
 
     if setup['showerrors']:
         for plugin in serverplugins.values() + serverlessplugins.values():
@@ -176,7 +176,7 @@ def main():
         raise SystemExit(0)
 
     run_serverless_plugins(serverlessplugins, errorhandler=errorhandler,
-                           setup=setup, files=files)
+                           files=files)
 
     if serverplugins:
         if errorhandler.errors:
@@ -192,7 +192,7 @@ def main():
                   "plugins")
         else:
             run_server_plugins(serverplugins, errorhandler=errorhandler,
-                               setup=setup, files=files)
+                               files=files)
 
     if errorhandler.errors or errorhandler.warnings or setup['verbose']:
         print("%d errors" % errorhandler.errors)