This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2gobroker. commit 1fa3006f09d1e6d93bebba0422055a84682d796d Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Fri Jul 11 13:42:41 2014 +0200 Fix typos and host/port mixups in the remote_sshproxy logic. (Fixes: #544). --- debian/changelog | 1 + x2gobroker/brokers/base_broker.py | 7 +++---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index 2f1d3b8..f662963 100644 --- a/debian/changelog +++ b/debian/changelog @@ -185,6 +185,7 @@ x2gobroker (0.0.3.0-0x2go1) UNRELEASED; urgency=low selected. - Add basic support for pulling https_get authmech config from configuration file. (Fixes: #470). + - Fix typos and host/port mixups in the remote_sshproxy logic. (Fixes: #544). -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Fri, 07 Jun 2013 23:25:30 +0200 diff --git a/x2gobroker/brokers/base_broker.py b/x2gobroker/brokers/base_broker.py index ef895ab..e92c7d8 100644 --- a/x2gobroker/brokers/base_broker.py +++ b/x2gobroker/brokers/base_broker.py @@ -1183,11 +1183,10 @@ class X2GoBroker(object): if profile.has_key(u'sshproxyhost') and profile[u'sshproxyhost']: remote_sshproxy_agent = { u'hostname': profile[u'sshproxyhost'], + u'port': "22" } - if profile.has_key(u'sshproxyhost') and profile[u'sshproxyhost']: - remote_sshrpoxy_agent[u'port'] = profile[u'sshproxyhost'] - else: - remote_sshrpoxy_agent[u'port'] = "22" + if profile.has_key(u'sshproxyport') and profile[u'sshproxyport']: + remote_sshproxy_agent[u'port'] = profile[u'sshproxyport'] else: remote_sshproxy_agent = None -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2gobroker.git