[X2go-Commits] python-x2go.git - master (branch) updated: 0.1.1.4-12-g47c2a3e

X2go dev team git-admin at x2go.org
Mon Jul 25 08:24:02 CEST 2011


The branch, master has been updated
       via  47c2a3e5f824fd97e9751e397237cb79db7a5912 (commit)
      from  7db65397b994a99066a77b4166c5d0487cb0f974 (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 47c2a3e5f824fd97e9751e397237cb79db7a5912
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Mon Jul 25 08:23:27 2011 +0200

    catching a socket.error exception during command execution

-----------------------------------------------------------------------

Summary of changes:
 x2go/backends/control/_stdout.py |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

The diff of changes is:
diff --git a/x2go/backends/control/_stdout.py b/x2go/backends/control/_stdout.py
index 7153617..475ab43 100644
--- a/x2go/backends/control/_stdout.py
+++ b/x2go/backends/control/_stdout.py
@@ -211,6 +211,12 @@ class X2goControlSessionSTDOUT(paramiko.SSHClient):
                     self.sshproxy_session.stop_thread()
                 self.locked = False
                 raise x2go_exceptions.X2goControlSessionException('the X2go control session command timed out')
+            except socket.error:
+                self.session_died = True
+                if self.sshproxy_session:
+                    self.sshproxy_session.stop_thread()
+                self.locked = False
+                raise x2go_exceptions.X2goControlSessionException('the X2go control session has died unexpectedly')
             finally:
                 self.locked = False
                 timeout.cancel()


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