diff options
| author | Narayan Desai <desai@mcs.anl.gov> | 2008-04-01 01:31:19 +0000 |
|---|---|---|
| committer | Narayan Desai <desai@mcs.anl.gov> | 2008-04-01 01:31:19 +0000 |
| commit | e278a050ee2db80223200aadc09e38b7f1b8917b (patch) | |
| tree | 0ead7caca65f06551cedcc78cdd541115b048444 /src/lib/Proxy.py | |
| parent | bde65a6f19974d60eb49e2108065795da6778c9b (diff) | |
| download | bcfg2-e278a050ee2db80223200aadc09e38b7f1b8917b.tar.gz bcfg2-e278a050ee2db80223200aadc09e38b7f1b8917b.tar.bz2 bcfg2-e278a050ee2db80223200aadc09e38b7f1b8917b.zip | |
multi-fingerprint support (mainly from Ben Ritcey)
git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@4464 ce84e21b-d406-0410-9b95-82705330c041
Diffstat (limited to 'src/lib/Proxy.py')
| -rw-r--r-- | src/lib/Proxy.py | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/lib/Proxy.py b/src/lib/Proxy.py index 685d2096c..bd0408fbb 100644 --- a/src/lib/Proxy.py +++ b/src/lib/Proxy.py @@ -33,10 +33,7 @@ class RetryMethod(_Method): self.log.error("Server failure: %s" % msg) raise xmlrpclib.Fault(20, msg) except Bcfg2.tlslite.errors.TLSFingerprintError, err: - self.log.error("Server fingerprint did not match") - errmsg = err.message.split() - self.log.error("Got %s expected %s" % (errmsg[3], errmsg[4])) - raise SystemExit, 1 + raise except Bcfg2.tlslite.errors.TLSError, err: self.log.error("Unexpected TLS Error: %s. Retrying" % \ (err.message)) |