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, 32 deletions

diff --git a/src/lib/Bcfg2/Reporting/Transport/__init__.py b/src/lib/Bcfg2/Reporting/Transport/__init__.py
index 73bdd0b3a..04b574ed7 100644
--- a/src/lib/Bcfg2/Reporting/Transport/__init__.py
+++ b/src/lib/Bcfg2/Reporting/Transport/__init__.py
@@ -1,35 +1,3 @@
 """
 Public transport routines
 """
-
-import sys
-from Bcfg2.Reporting.Transport.base import TransportError, \
-    TransportImportError
-
-
-def load_transport(transport_name, setup):
-    """
-    Try to load the transport.  Raise TransportImportError on failure
-    """
-    try:
-        mod_name = "%s.%s" % (__name__, transport_name)
-        mod = getattr(__import__(mod_name).Reporting.Transport, transport_name)
-    except ImportError:
-        try:
-            mod = __import__(transport_name)
-        except:
-            raise TransportImportError("Error importing transport %s: %s" %
-                                       (transport_name, sys.exc_info()[1]))
-    try:
-        return getattr(mod, transport_name)(setup)
-    except:
-        raise TransportImportError("Error instantiating transport %s: %s" %
-                                   (transport_name, sys.exc_info()[1]))
-
-
-def load_transport_from_config(setup):
-    """Load the transport in the config... eventually"""
-    try:
-        return load_transport(setup['reporting_transport'], setup)
-    except KeyError:
-        raise TransportImportError('Transport missing in config')