[X2Go-Commits] python-x2go.git - build-baikal (branch) updated: 0.1.1.4-266-g61a2a2e
X2Go dev team
git-admin at x2go.org
Wed Jan 8 15:29:11 CET 2014
The branch, build-baikal has been updated
via 61a2a2eac22d0bc925de49183a4e5a957f8650ac (commit)
from 37890ac8deb12f53ab77ed0490d145e7a867ed40 (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/backends/proxy/base.py | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
The diff of changes is:
diff --git a/x2go/backends/proxy/base.py b/x2go/backends/proxy/base.py
index 610ef18..1c62313 100644
--- a/x2go/backends/proxy/base.py
+++ b/x2go/backends/proxy/base.py
@@ -183,8 +183,8 @@ class X2goProxyBASE(threading.Thread):
local_graphics_port = utils.detect_unused_port(preferred_port=local_graphics_port)
self.fw_tunnel = forward.start_forward_tunnel(local_port=local_graphics_port,
- remote_port=self.session_info.graphics_port,
- ssh_transport=self.ssh_transport,
+ remote_port=self.session_info.graphics_port,
+ ssh_transport=self.ssh_transport,
session_instance=self.session_instance,
logger=self.logger,
)
@@ -278,7 +278,7 @@ class X2goProxyBASE(threading.Thread):
# also wait for fw_tunnel to become active
_count = 0
_maxwait = 40
- while not self.fw_tunnel.is_active and not self.fw_tunnel.failed and _count < _maxwait:
+ while (not self.fw_tunnel.is_active) and (not self.fw_tunnel.failed) and (_count < _maxwait):
_count += 1
self.logger('waiting for port fw tunnel to come up: 0.5s x %s' % _count, loglevel=log.loglevel_DEBUG)
gevent.sleep(.5)
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