The branch, master has been updated via e1b34e08af86bd3c56119cf467dfae5520c07fac (commit) via cd14d38e23fb6cf8e7860a6f7290669301c874f4 (commit) from 4de963ff56562f3fcb967ba2344d122e825aeb14 (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 e1b34e08af86bd3c56119cf467dfae5520c07fac Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Sun Jan 13 15:54:50 2013 +0100 bump version to 0.2.2.0 commit cd14d38e23fb6cf8e7860a6f7290669301c874f4 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Sun Jan 13 15:54:09 2013 +0100 make SSH proxy setting migration more smooth ----------------------------------------------------------------------- Summary of changes: debian/changelog | 6 +++--- x2go/__init__.py | 2 +- x2go/backends/control/_stdout.py | 3 +++ x2go/defaults.py | 2 +- x2go/utils.py | 13 +++++++++---- 5 files changed, 17 insertions(+), 9 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index ca60226..33a0f83 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,13 +1,13 @@ -python-x2go (0.2.1.2-0~x2go1) UNRELEASED; urgency=low +python-x2go (0.2.2.0-0~x2go1) UNRELEASED; urgency=low [ Orion Poplawski ] - * New upstream version (0.2.1.2): + * New upstream version (0.2.2.0): - Importing all of x2go in setup.py causes rpmbuild problems due to DISPLAY not being set. It is overkill as well, causing extra dependencies to be installed at build time. (Fixes: #91). [ Mike Gabriel ] - * New upstream version (0.2.1.2): + * New upstream version (0.2.2.0): - Add session profile option ,,display'' to default session profile options. - Catch any kind of exception when writing session profile files and return True or False in cases where I/O errors occur. diff --git a/x2go/__init__.py b/x2go/__init__.py index aefd224..8398a96 100644 --- a/x2go/__init__.py +++ b/x2go/__init__.py @@ -178,7 +178,7 @@ Contact """ __NAME__ = 'python-x2go' -__VERSION__ = '0.2.1.2' +__VERSION__ = '0.2.2.0' from gevent import monkey monkey.patch_all() diff --git a/x2go/backends/control/_stdout.py b/x2go/backends/control/_stdout.py index d7e0aec..2112f14 100644 --- a/x2go/backends/control/_stdout.py +++ b/x2go/backends/control/_stdout.py @@ -722,6 +722,9 @@ class X2goControlSessionSTDOUT(paramiko.SSHClient): if use_sshproxy and sshproxy_host and sshproxy_user: try: + + if not sshproxy_tunnel: + sshproxy_tunnel = "localhost:44444:%s:%s" % (hostname, port) self.sshproxy_session = sshproxy.X2goSSHProxy(known_hosts=self.known_hosts, sshproxy_host=sshproxy_host, sshproxy_port=sshproxy_port, diff --git a/x2go/defaults.py b/x2go/defaults.py index b40fefc..8689608 100644 --- a/x2go/defaults.py +++ b/x2go/defaults.py @@ -295,7 +295,7 @@ X2GO_SESSIONPROFILE_DEFAULTS = { 'autologin': True, 'autoconnect': False, 'autostart': False, 'setsessiontitle': False, 'sessiontitle': "", 'speed': 2, 'pack': '16m-jpeg', 'quality': 9, 'iconvto': 'UTF-8', 'iconvfrom': 'UTF-8', 'useiconv': False, - 'usesshproxy': False, 'sshproxyhost': 'proxyhost.mydomain', 'sshproxyport': 22, 'sshproxyuser': '', 'sshproxytunnel': 'localhost:44444:server.mydomain.private:22', 'sshproxykeyfile': '', + 'usesshproxy': False, 'sshproxyhost': 'proxyhost.mydomain', 'sshproxyport': 22, 'sshproxyuser': '', 'sshproxykeyfile': '', 'sshproxytype': 'SSH', 'sshproxysameuser': False, 'sshproxysamepass': False, 'sshproxyautologin': True, 'useexports': True, 'restoreexports': False, 'fstunnel': True, 'export': '', 'usemimebox': False, 'mimeboxextensions': '', 'mimeboxaction': 'OPEN', diff --git a/x2go/utils.py b/x2go/utils.py index f621ece..a83c78a 100644 --- a/x2go/utils.py +++ b/x2go/utils.py @@ -328,12 +328,17 @@ def _convert_SessionProfileOptions_2_SessionParams(options): del _params['sshproxysamepass'] if _params['use_sshproxy']: - _params['server'] = options['sshproxytunnel'].split(":")[-2] - _params['port'] = options['sshproxytunnel'].split(":")[-1] + + # compat code for Python X2Go 0.2.1.0 -> 0.2.2.0 + if options.has_key('sshproxytunnel'): + if not options['sshproxytunnel'].startswith('DEPRECATED'): + _params['server'] = options['sshproxytunnel'].split(":")[-2] + _params['port'] = options['sshproxytunnel'].split(":")[-1] + try: del _params['sshproxytunnel'] + except KeyError: pass + _params['sshproxy_tunnel'] = 'localhost:44444:%s:%s' % (_params['server'], _params['port']) - if options['sshproxytunnel']: - del _params['sshproxytunnel'] # 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).