[X2Go-Commits] python-x2go.git - build-baikal (branch) updated: 4217dbfc99e79b274ece0ebfececa4db9f6940f1
X2Go dev team
git-admin at x2go.org
Wed Jan 8 15:29:42 CET 2014
The branch, build-baikal has been updated
via 4217dbfc99e79b274ece0ebfececa4db9f6940f1 (commit)
from 6c87cc5cfc6864e49a435085fd2885fe356a841b (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/control/_stdout.py | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
The diff of changes is:
diff --git a/x2go/backends/control/_stdout.py b/x2go/backends/control/_stdout.py
index 1d66c45..5c5c91c 100644
--- a/x2go/backends/control/_stdout.py
+++ b/x2go/backends/control/_stdout.py
@@ -175,7 +175,7 @@ class X2goControlSessionSTDOUT(paramiko.SSHClient):
cmd = cmd_line
if self.get_transport() is not None:
- timeout = gevent.Timeout(10)
+ timeout = gevent.Timeout(20)
timeout.start()
try:
self.logger('executing command on X2go server: %s' % _rerewrite_blanks(cmd), loglevel)
@@ -665,7 +665,8 @@ class X2goControlSessionSTDOUT(paramiko.SSHClient):
if self.associated_terminals.has_key(session_name):
if self.associated_terminals[session_name] is not None:
self.associated_terminals[session_name].__del__()
- del self.associated_terminals[session_name]
+ try: del self.associated_terminals[session_name]
+ except KeyError: pass
_ret = True
else:
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