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