The branch, master has been updated via 54ba077c24f31891f5c466e5a0ba3a39897c8a53 (commit) from b898e68df808df4f2237b4130fa23bab5200a2cf (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 54ba077c24f31891f5c466e5a0ba3a39897c8a53 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Mon Oct 8 09:33:43 2012 +0200 Allow smooth session profile migration, prefer <host>:<port> (set via sshproxy_host) for SSH proxy port detection. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 ++ x2go/sshproxy.py | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index b1c293d..9811041 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,8 @@ python-x2go (0.2.0.11-0~x2go1) UNRELEASED; urgency=low - Prepare for staying compatible with new SSH proxy feature in X2Go Client. - Add sshproxy_port option to session (SSH proxy) options. + - Allow smooth session profile migration, prefer <host>:<port> (set + via sshproxy_host) for SSH proxy port detection. - Implementation of session profile parameters ,,sshproxysameuser'' and ,,sshproxysameauth''. - Fixing typos in __doc__ strings. diff --git a/x2go/sshproxy.py b/x2go/sshproxy.py index f595388..86b3817 100644 --- a/x2go/sshproxy.py +++ b/x2go/sshproxy.py @@ -132,7 +132,10 @@ class X2goSSHProxy(paramiko.SSHClient, threading.Thread): self.hostname, self.port, self.username = hostname, port, username + if sshproxy_port: self.port = sshproxy_port + # translate between X2goSession options and paramiko.SSHCLient.connect() options + # if <hostname>:<port> is used for sshproxy_host, then this <port> is used if sshproxy_host: if sshproxy_host.find(':'): self.hostname = sshproxy_host.split(':')[0] @@ -141,7 +144,6 @@ class X2goSSHProxy(paramiko.SSHClient, threading.Thread): else: self.hostname = sshproxy_host - if sshproxy_port: self.port = sshproxy_port if sshproxy_user: self.username = sshproxy_user if sshproxy_password: password = sshproxy_password if sshproxy_key_filename: key_filename = sshproxy_key_filename 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).