The branch, twofactorauth has been updated via 5466f298a3da2e0465592c29954554842eb09b6f (commit) from 62c6b32554e1cbeac1453fe092bea1d451b0f012 (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 5466f298a3da2e0465592c29954554842eb09b6f Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Tue Sep 17 23:14:02 2013 +0200 warn about old paramiko version ----------------------------------------------------------------------- Summary of changes: x2go/backends/control/_stdout.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) The diff of changes is: diff --git a/x2go/backends/control/_stdout.py b/x2go/backends/control/_stdout.py index c7dd69b..638b5b9 100644 --- a/x2go/backends/control/_stdout.py +++ b/x2go/backends/control/_stdout.py @@ -906,10 +906,11 @@ class X2GoControlSessionSTDOUT(paramiko.SSHClient): key_filename=key_filename, timeout=timeout, allow_agent=False, look_for_keys=False) except TypeError: + if password and passphrase and password != passphrase: self.logger('your version of Paramiko/SSH does not support authentication workflows which require SSH key decryption in combination with two-factor authentication', loglevel=log.loglevel_WARN) - paramiko.SSHClient.connect(self, _hostname, port=port, username=username, password=password, pkey=pkey, - key_filename=key_filename, timeout=timeout, allow_agent=False, - look_for_keys=False) + paramiko.SSHClient.connect(self, _hostname, port=port, username=username, password=password, pkey=pkey, + key_filename=key_filename, timeout=timeout, allow_agent=False, + look_for_keys=False) else: self.logger('re-trying SSH key discovery or agent authentication with server', loglevel=log.loglevel_DEBUG) try: 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).