diff options
| author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2013-08-09 11:47:16 -0400 |
|---|---|---|
| committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2013-08-09 11:47:18 -0400 |
| commit | 304eafa1e4115c82e8270daf4c543684c3cd75ae (patch) | |
| tree | d366e0ea1eaaf5060ce4cb223d34dc906922ce1a /src/lib/Bcfg2/Client/__init__.py | |
| parent | 6fedc7a28b21cab6be173ab8ef82113697ab170b (diff) | |
| download | bcfg2-304eafa1e4115c82e8270daf4c543684c3cd75ae.tar.gz bcfg2-304eafa1e4115c82e8270daf4c543684c3cd75ae.tar.bz2 bcfg2-304eafa1e4115c82e8270daf4c543684c3cd75ae.zip | |
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.
Diffstat (limited to 'src/lib/Bcfg2/Client/__init__.py')
| -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): |