From 7871f1a492bf5139bdda35712741a855b00cb965 Mon Sep 17 00:00:00 2001 From: Narayan Desai Date: Tue, 3 Jun 2008 17:39:34 +0000 Subject: Fix error path (Reported by jcollie on irc) git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@4653 ce84e21b-d406-0410-9b95-82705330c041 --- src/lib/Proxy.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/lib/Proxy.py b/src/lib/Proxy.py index bd0408fbb..cabdebdc5 100644 --- a/src/lib/Proxy.py +++ b/src/lib/Proxy.py @@ -28,10 +28,10 @@ class RetryMethod(_Method): except xmlrpclib.ProtocolError: self.log.error("Server failure: Protocol Error") raise xmlrpclib.Fault(20, "Server Failure") - except socket.error, (err, msg): + except socket.error, err: if retry == 3: - self.log.error("Server failure: %s" % msg) - raise xmlrpclib.Fault(20, msg) + self.log.error("Server failure: %s" % err) + raise xmlrpclib.Fault(20, err) except Bcfg2.tlslite.errors.TLSFingerprintError, err: raise except Bcfg2.tlslite.errors.TLSError, err: -- cgit v1.2.3-1-g7c22