The branch, twofactorauth has been updated via a96f3876b630b7735fa0edd869801bb2f4fd8ac9 (commit) from 2e441444735e8fe81627e315b2d10bd09d1cad60 (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 a96f3876b630b7735fa0edd869801bb2f4fd8ac9 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Wed Oct 9 21:02:43 2013 +0200 improvement for last commit ----------------------------------------------------------------------- Summary of changes: x2go/backends/control/_stdout.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/x2go/backends/control/_stdout.py b/x2go/backends/control/_stdout.py index e151254..098f3a8 100644 --- a/x2go/backends/control/_stdout.py +++ b/x2go/backends/control/_stdout.py @@ -908,7 +908,7 @@ class X2GoControlSessionSTDOUT(paramiko.SSHClient): key_filename=key_filename, timeout=timeout, allow_agent=False, look_for_keys=False) except TypeError: - if _twofactorauth: + if _twofactorauth and 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_NOTICE) paramiko.SSHClient.connect(self, _hostname, port=port, username=username, password=password, pkey=pkey, key_filename=key_filename, timeout=timeout, allow_agent=False, @@ -920,7 +920,7 @@ class X2GoControlSessionSTDOUT(paramiko.SSHClient): key_filename=None, timeout=timeout, allow_agent=allow_agent, look_for_keys=look_for_keys) except TypeError: - if _twofactorauth: + if _twofactorauth and 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_NOTICE) paramiko.SSHClient.connect(self, _hostname, port=port, username=username, password=password, pkey=None, key_filename=None, timeout=timeout, allow_agent=allow_agent, 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).