diff options
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/Server/Admin/Reports.py | 7 | ||||
| -rw-r--r-- | src/lib/Server/Admin/Xcmd.py | 7 |
2 files changed, 5 insertions, 9 deletions
diff --git a/src/lib/Server/Admin/Reports.py b/src/lib/Server/Admin/Reports.py index c9f3d3f58..b4c3b5fcd 100644 --- a/src/lib/Server/Admin/Reports.py +++ b/src/lib/Server/Admin/Reports.py @@ -28,10 +28,9 @@ import django.core.management # FIXME - settings file uses a hardcoded path for /etc/bcfg2.conf try: import Bcfg2.Server.Reports.settings -except Exception: - e = sys.exc_info()[1] - sys.stderr.write("Failed to load configuration settings. %s\n" % e) - sys.exit(1) +except Exception, err: + sys.stderr.write("Failed to load configuration settings. %s\n" % err) + raise SystemExit(1) project_directory = os.path.dirname(Bcfg2.Server.Reports.settings.__file__) project_name = os.path.basename(project_directory) diff --git a/src/lib/Server/Admin/Xcmd.py b/src/lib/Server/Admin/Xcmd.py index 2cb085346..6147139fb 100644 --- a/src/lib/Server/Admin/Xcmd.py +++ b/src/lib/Server/Admin/Xcmd.py @@ -1,5 +1,3 @@ -import sys - import Bcfg2.Options import Bcfg2.Proxy import Bcfg2.Server.Admin @@ -24,7 +22,7 @@ class Xcmd(Bcfg2.Server.Admin.Mode): 'timeout': Bcfg2.Options.CLIENT_TIMEOUT, } setup = Bcfg2.Options.OptionParser(optinfo) - setup.parse(sys.argv[2:]) + setup.parse(args) Bcfg2.Proxy.RetryMethod.max_retries = 1 proxy = Bcfg2.Proxy.ComponentProxy(setup['server'], setup['user'], @@ -42,8 +40,7 @@ class Xcmd(Bcfg2.Server.Admin.Mode): args = tuple(setup['args'][1:]) try: data = getattr(proxy, cmd)(*args) - except xmlrpclib.Fault: - flt = sys.exc_info()[1] + except xmlrpclib.Fault, flt: if flt.faultCode == 7: print("Unknown method %s" % cmd) return |