[X2Go-Commits] python-x2go.git - build-baikal (branch) updated: 0.2.1.1-14-ga986b60
X2Go dev team
git-admin at x2go.org
Wed Jan 8 15:31:27 CET 2014
The branch, build-baikal has been updated
via a986b6081ff2f677036342e210ec9fac3d2f1331 (commit)
from 60047c179c15e332894d321f323270b0675093ad (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 -----------------------------------------------------------------
-----------------------------------------------------------------------
Summary of changes:
x2go/utils.py | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
The diff of changes is:
diff --git a/x2go/utils.py b/x2go/utils.py
index 421e066..5cbafa4 100644
--- a/x2go/utils.py
+++ b/x2go/utils.py
@@ -205,6 +205,8 @@ def _convert_SessionProfileOptions_2_SessionParams(options):
'sshproxyport': 'sshproxy_port',
'sshproxyuser': 'sshproxy_user',
'sshproxykeyfile': 'sshproxy_key_filename',
+ # FIXME: remove this next option...
+ 'sshproxytunnel': 'sshproxy_tunnel',
'sessiontitle': 'session_title',
'setsessiontitle': 'set_session_title',
'published': 'published_applications',
@@ -327,11 +329,11 @@ def _convert_SessionProfileOptions_2_SessionParams(options):
_params['sshproxy_key_filename'] = _params['key_filename']
del _params['sshproxysamepass']
- if options['sshproxytunnel']:
- del _params['sshproxytunnel']
-
- if _params['use_sshproxy']:
- _params['sshproxy_tunnel'] = 'localhost:44444:%s:%s' % (_params['server'], _params['port'])
+ #if options['sshproxytunnel']:
+ # del _params['sshproxytunnel']
+ #
+ #if _params['use_sshproxy']:
+ # _params['sshproxy_tunnel'] = 'localhost:44444:%s:%s' % (_params['server'], _params['port'])
# currently known but ignored in Python X2go
_ignored_options = [
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).
More information about the x2go-commits
mailing list