Revert "bcfg2-admin: set appropriate return values on error"

This reverts commit dae8f399151052fd2a0ce43ac61a56f399a28252.

Splitting this into two commits.

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)