The branch, master has been updated via 0bf478f7f33a0842cdf940c9d320d9dbae39a888 (commit) from 6e04237345370000d3deda0e66b462670b626d54 (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 0bf478f7f33a0842cdf940c9d320d9dbae39a888 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Tue Nov 5 17:54:27 2013 +0100 fix for last commit ----------------------------------------------------------------------- Summary of changes: x2go/backends/control/_stdout.py | 2 +- x2go/sshproxy.py | 2 +- 2 files 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 78ac5bb..88b07de 100644 --- a/x2go/backends/control/_stdout.py +++ b/x2go/backends/control/_stdout.py @@ -902,7 +902,7 @@ class X2GoControlSessionSTDOUT(paramiko.SSHClient): if timeout and self.low_latency: timeout = timeout * 2 - if "~" in key_filename: + if key_filename and "~" in key_filename: key_filename = os.path.expanduser(key_filename) if key_filename or pkey or look_for_keys or allow_agent or (password and force_password_auth): diff --git a/x2go/sshproxy.py b/x2go/sshproxy.py index ee1fa6f..79b69c0 100644 --- a/x2go/sshproxy.py +++ b/x2go/sshproxy.py @@ -192,7 +192,7 @@ class X2GoSSHProxy(paramiko.SSHClient, threading.Thread): key_filename = None pkey = None - if "~" in key_filename: + if key_filename and "~" in key_filename: key_filename = os.path.expanduser(key_filename) if not passphrase: passphrase = password 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).