[X2go-Commits] python-x2go.git - master (branch) updated: 0.1.0.3-7-g94a3a09
X2go dev team
git-admin at x2go.org
Mon Jun 20 10:13:32 CEST 2011
The branch, master has been updated
via 94a3a09921f8ece7076a485c127aafa55e42d2cd (commit)
from e0a1241c3982f8d637ccda7f2fe9c0f3a3ed21af (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 94a3a09921f8ece7076a485c127aafa55e42d2cd
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date: Mon Jun 20 10:13:16 2011 +0200
catch SSHException during x2go_exec_command
-----------------------------------------------------------------------
Summary of changes:
x2go/backends/control/_stdout.py | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
The diff of changes is:
diff --git a/x2go/backends/control/_stdout.py b/x2go/backends/control/_stdout.py
index a34a2bc..38e3a6f 100644
--- a/x2go/backends/control/_stdout.py
+++ b/x2go/backends/control/_stdout.py
@@ -198,6 +198,11 @@ class X2goControlSessionSTDOUT(paramiko.SSHClient):
if self.sshproxy_session:
self.sshproxy_session.stop_thread()
raise x2go_exceptions.X2goControlSessionException('the X2go control session has died unexpectedly')
+ except x2go_exceptions.SSHException:
+ self.session_died = True
+ if self.sshproxy_session:
+ self.sshproxy_session.stop_thread()
+ raise x2go_exceptions.X2goControlSessionException('the X2go control session has died unexpectedly')
except gevent.timeout.Timeout:
self.session_died = True
if self.sshproxy_session:
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