[X2Go-Commits] python-x2go.git - release/0.4.0.x (branch) updated: 0.1.1.4-240-g5820e62

X2Go dev team git-admin at x2go.org
Tue Jan 7 16:17:57 CET 2014


The branch, release/0.4.0.x has been updated
       via  5820e6271f652a779cede45354cc5014c952e458 (commit)
      from  1908ff8185d9faba7bd162455439f67d4b81a77a (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:
 debian/changelog |    1 +
 x2go/session.py  |    7 +++++--
 2 files changed, 6 insertions(+), 2 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 3b096a6..bb03bc8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -127,6 +127,7 @@ python-x2go (0.1.2.0-0~x2go1) UNRELEASED; urgency=low
       the connection broke.
     - Allow custom commands to be desktop sessions.
     - X2goSession instances cannot raise X2goClientExceptions.
+    - Be more tolerant against suspension failures while taking over a session.
   * Depend on python-xlib.
 
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Sat, 28 Sep 2012 01:44:21 +0100
diff --git a/x2go/session.py b/x2go/session.py
index 35c55ab..22f8ac9 100644
--- a/x2go/session.py
+++ b/x2go/session.py
@@ -1447,8 +1447,11 @@ class X2goSession(object):
             # we do not have a possibility to really check if SSH has released port forwarding channels or
             # sockets, thus  we plainly have to wait a while
             if self.is_running():
-                self.suspend()
-                gevent.sleep(5)
+                try:
+                    self.suspend()
+                    gevent.sleep(5)
+                except x2go_exceptions.X2goSessionException:
+                    pass
 
             try:
                 if self.published_applications:


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