diff options
| -rw-r--r-- | src/lib/Bcfg2/Client/__init__.py | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/src/lib/Bcfg2/Client/__init__.py b/src/lib/Bcfg2/Client/__init__.py index 2761fcddb..59e9b0148 100644 --- a/src/lib/Bcfg2/Client/__init__.py +++ b/src/lib/Bcfg2/Client/__init__.py @@ -296,16 +296,8 @@ class Client(object): try: self.proxy.DeclareVersion(__version__) - except xmlrpclib.Fault: - err = sys.exc_info()[1] - if (err.faultCode == xmlrpclib.METHOD_NOT_FOUND or - (err.faultCode == 7 and - err.faultString.startswith("Unknown method"))): - self.logger.debug("Server does not support declaring " - "client version") - else: - self.logger.error("Failed to declare version: %s" % err) - except (Proxy.ProxyError, + except (xmlrpclib.Fault, + Proxy.ProxyError, Proxy.CertificateError, socket.gaierror, socket.error): |