summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorNarayan Desai <desai@mcs.anl.gov>2008-06-03 17:39:34 +0000
committerNarayan Desai <desai@mcs.anl.gov>2008-06-03 17:39:34 +0000
commit7871f1a492bf5139bdda35712741a855b00cb965 (patch)
treeae030caf26d5739ffe62eaf5f5725c28938e893d /src
parent57e79f8f486b2b40e1a582dfdf39796dbb5ac4b9 (diff)
downloadbcfg2-7871f1a492bf5139bdda35712741a855b00cb965.tar.gz
bcfg2-7871f1a492bf5139bdda35712741a855b00cb965.tar.bz2
bcfg2-7871f1a492bf5139bdda35712741a855b00cb965.zip
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
Diffstat (limited to 'src')
-rw-r--r--src/lib/Proxy.py6
1 files 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: