From 304eafa1e4115c82e8270daf4c543684c3cd75ae Mon Sep 17 00:00:00 2001 From: "Chris St. Pierre" Date: Fri, 9 Aug 2013 11:47:16 -0400 Subject: Client: Handle all DeclareVersion failures the same Some xmlrpclib.Fault exceptions were handled differently because originally, the Bcfg2 1.3 client was going to be compatible with a Bcfg2 1.2 server. That didn't happen, and sure isn't going to happen with a Bcfg2 1.4 client. --- src/lib/Bcfg2/Client/__init__.py | 12 ++---------- 1 file 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): -- cgit v1.2.3-1-g7c22