[X2Go-Commits] python-x2go.git - build-baikal (branch) updated: 0.2.0.1-5-g6184896
X2Go dev team
git-admin at x2go.org
Wed Jan 8 15:27:07 CET 2014
The branch, build-baikal has been updated
via 6184896fab1e7e2551f561e854db30e07d4ec032 (commit)
from 0983bbcce7c7ff1cfd98b9dd96045607fc2a8a1d (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/cache.py | 4 ++++
2 files changed, 5 insertions(+)
The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index eff4c5b..b100123 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ python-x2go (0.2.0.2-0~x2go1) UNRELEASED; urgency=low
- Be tolerant if we can not terminate a session after failure of the
forwarding tunnel.
- Improve session management, handle exceptions more gracefully.
+ - Ignoring timeouts for x2golistmounts and x2golistdesktops.
-- Mike Gabriel <mike.gabriel at das-netzwerkteam.de> Wed, 30 May 2012 00:27:03 +0200
diff --git a/x2go/cache.py b/x2go/cache.py
index 2b6f9ec..6892d8a 100644
--- a/x2go/cache.py
+++ b/x2go/cache.py
@@ -156,6 +156,8 @@ class X2goListSessionsCache(object):
if profile_name in self.x2go_listsessions_cache.keys():
del self.x2go_listsessions_cache[profile_name]
raise e
+ except x2go_exceptions.X2goTimeOutException:
+ pass
def _update_desktops(self, profile_name, control_session):
"""\
@@ -174,6 +176,8 @@ class X2goListSessionsCache(object):
if profile_name in self.x2go_listsessions_cache.keys():
del self.x2go_listsessions_cache[profile_name]
raise e
+ except x2go_exceptions.X2goTimeOutException:
+ pass
def _update_sessions(self, profile_name, control_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