The branch, master has been updated via 9a1a4ca33406da3af938254e18e568c1fc354b10 (commit) from c74e7181b1a71a95fa74b72bd7724a6f6729d19e (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 9a1a4ca33406da3af938254e18e568c1fc354b10 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Tue Sep 3 18:21:47 2013 +0200 fine-tuning SSH proxy auth ----------------------------------------------------------------------- Summary of changes: x2go/sshproxy.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) The diff of changes is: diff --git a/x2go/sshproxy.py b/x2go/sshproxy.py index 5aaba51..9ef3cea 100644 --- a/x2go/sshproxy.py +++ b/x2go/sshproxy.py @@ -259,16 +259,15 @@ class X2GoSSHProxy(paramiko.SSHClient, threading.Thread): allow_agent=allow_agent, password=password, ) - except x2go_exceptions.AuthenticationException, e: - raise x2go_exceptions.X2GoSSHProxyPasswordRequiredException(str(e)) + except x2go_exceptions.AuthenticationException, auth_e: + raise x2go_exceptions.X2GoSSHProxyPasswordRequiredException(str(auth_e)) else: raise x2go_exceptions.X2GoSSHProxyPasswordRequiredException(str(e)) - except x2go_exceptions.AuthenticationException, e: - + except x2go_exceptions.AuthenticationException: self.close() raise x2go_exceptions.X2GoSSHProxyAuthenticationException('pubkey auth mechanisms both failed') - except x2go_exceptions.SSHException, e: + except x2go_exceptions.SSHException: self.close() raise x2go_exceptions.X2GoSSHProxyAuthenticationException('interactive authentication required') except: hooks/post-receive -- python-x2go.git (Python X2Go Client API) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "python-x2go.git" (Python X2Go Client API).