Merge branch 'options-rewrite'

Conflicts:
	src/lib/Bcfg2/Client/Frame.py
	src/lib/Bcfg2/Options.py
	src/lib/Bcfg2/Server/Admin/Init.py
	src/lib/Bcfg2/Server/Admin/Xcmd.py
	src/lib/Bcfg2/Server/BuiltinCore.py
	src/lib/Bcfg2/Server/Core.py
	src/lib/Bcfg2/Server/MultiprocessingCore.py
	src/lib/Bcfg2/Server/Plugin/base.py
	src/lib/Bcfg2/Server/Plugin/helpers.py
	src/lib/Bcfg2/Server/Plugins/Cfg/__init__.py
	src/lib/Bcfg2/Server/Plugins/Packages/Yum.py
	src/lib/Bcfg2/Server/Plugins/Packages/__init__.py
	src/lib/Bcfg2/Server/SSLServer.py
	src/lib/Bcfg2/Utils.py
	src/lib/Bcfg2/settings.py
	src/sbin/bcfg2-crypt
	src/sbin/bcfg2-info
	src/sbin/bcfg2-lint
	src/sbin/bcfg2-test
	src/sbin/bcfg2-yum-helper
	tools/bcfg2-profile-templates.py

1 files changed, 0 insertions, 54 deletions

diff --git a/src/lib/Bcfg2/Server/Admin/Xcmd.py b/src/lib/Bcfg2/Server/Admin/Xcmd.py
deleted file mode 100644
index f7f30fd80..000000000
--- a/src/lib/Bcfg2/Server/Admin/Xcmd.py
+++ /dev/null
@@ -1,54 +0,0 @@
-""" XML-RPC Command Interface for bcfg2-admin"""
-
-import sys
-import Bcfg2.Options
-import Bcfg2.Client.Proxy
-import Bcfg2.Server.Admin
-from Bcfg2.Compat import xmlrpclib
-
-
-class Xcmd(Bcfg2.Server.Admin.Mode):
-    """ XML-RPC Command Interface """
-    __usage__ = "<command>"
-
-    def __call__(self, args):
-        setup = Bcfg2.Options.get_option_parser()
-        setup.add_options(dict(ca=Bcfg2.Options.CLIENT_CA,
-                               certificate=Bcfg2.Options.CLIENT_CERT,
-                               key=Bcfg2.Options.SERVER_KEY,
-                               password=Bcfg2.Options.SERVER_PASSWORD,
-                               server=Bcfg2.Options.SERVER_LOCATION,
-                               user=Bcfg2.Options.CLIENT_USER,
-                               timeout=Bcfg2.Options.CLIENT_TIMEOUT))
-        opts = sys.argv[1:]
-        opts.remove(self.__class__.__name__.lower())
-        setup.reparse(argv=opts)
-        Bcfg2.Client.Proxy.RetryMethod.max_retries = 1
-        proxy = Bcfg2.Client.Proxy.ComponentProxy(setup['server'],
-                                                  setup['user'],
-                                                  setup['password'],
-                                                  key=setup['key'],
-                                                  cert=setup['certificate'],
-                                                  ca=setup['ca'],
-                                                  timeout=setup['timeout'])
-        if len(setup['args']) == 0 or len(args) == 0:
-            self.errExit("Usage: xcmd <xmlrpc method> <optional arguments>")
-        cmd = args[0]
-        try:
-            data = getattr(proxy, cmd)(*args[1:])
-        except xmlrpclib.Fault:
-            flt = sys.exc_info()[1]
-            if flt.faultCode == 7:
-                print("Unknown method %s" % cmd)
-                return
-            elif flt.faultCode == 20:
-                return
-            else:
-                raise
-        except Bcfg2.Client.Proxy.ProxyError:
-            err = sys.exc_info()[1]
-            print("Proxy Error: %s" % err)
-            return
-
-        if data is not None:
-            print(data)