diff options
author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2013-06-03 10:56:26 -0400 |
---|---|---|
committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2013-06-03 10:56:26 -0400 |
commit | 06dae2a73ae03ea72feed4e7d6e56d25cfa24195 (patch) | |
tree | 7e9464187639d8d32ba13958d22f7cc853e76e4b /src/lib/Bcfg2/Server/Admin/Xcmd.py | |
parent | dae8f399151052fd2a0ce43ac61a56f399a28252 (diff) | |
download | bcfg2-06dae2a73ae03ea72feed4e7d6e56d25cfa24195.tar.gz bcfg2-06dae2a73ae03ea72feed4e7d6e56d25cfa24195.tar.bz2 bcfg2-06dae2a73ae03ea72feed4e7d6e56d25cfa24195.zip |
Revert "bcfg2-admin: set appropriate return values on error"
This reverts commit dae8f399151052fd2a0ce43ac61a56f399a28252.
Splitting this into two commits.
Diffstat (limited to 'src/lib/Bcfg2/Server/Admin/Xcmd.py')
-rw-r--r-- | src/lib/Bcfg2/Server/Admin/Xcmd.py | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/src/lib/Bcfg2/Server/Admin/Xcmd.py b/src/lib/Bcfg2/Server/Admin/Xcmd.py index e3173e20a..be556bed4 100644 --- a/src/lib/Bcfg2/Server/Admin/Xcmd.py +++ b/src/lib/Bcfg2/Server/Admin/Xcmd.py @@ -31,15 +31,27 @@ class Xcmd(Bcfg2.Server.Admin.Mode): ca=setup['ca'], timeout=setup['timeout']) if len(setup['args']) == 0: - self.errExit("Usage: xcmd <xmlrpc method> <optional arguments>") + print("Usage: xcmd <xmlrpc method> <optional arguments>") + return cmd = setup['args'][0] args = () if len(setup['args']) > 1: args = tuple(setup['args'][1:]) try: data = getattr(proxy, cmd)(*args) + 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.Proxy.ProxyError: - self.errExit("Proxy Error: %s" % sys.exc_info()[1]) + err = sys.exc_info()[1] + print("Proxy Error: %s" % err) + return if data is not None: print(data) |