The branch, master has been updated via f1dc23233c1f0b9df67844a8245744e71c00b472 (commit) from b4335679fa7400e2e57c3992f9f25c4d1b719f3c (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 f1dc23233c1f0b9df67844a8245744e71c00b472 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Tue May 28 22:54:50 2013 +0200 Ignore KeyError exceptions in session cache for suddenly removed cache items. Silence/fix some race conditions on connection failures. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 ++ x2go/cache.py | 6 ++++++ 2 files changed, 8 insertions(+) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 589f0b9..4e98b34 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,8 @@ python-x2go (0.4.0.4-0~x2go1) UNRELEASED; urgency=low session profile configuration if unavailable. (Fixes: #192). - Become aware of fixed paramiko features since paramiko 1.11.0. Stop monkey patching those methods that got fixed in 1.11.0. + - Ignore KeyError exceptions in session cache for suddenly removed cache items. + Silence/fix some race conditions on connection failures. -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Sun, 21 Apr 2013 23:21:29 +0200 diff --git a/x2go/cache.py b/x2go/cache.py index 389d71a..757b827 100644 --- a/x2go/cache.py +++ b/x2go/cache.py @@ -161,6 +161,8 @@ class X2GoListSessionsCache(object): raise x2go_exceptions.X2GoControlSessionException except x2go_exceptions.X2GoTimeOutException: pass + except KeyError: + pass def _update_desktops(self, profile_name, control_session): """\ @@ -183,6 +185,8 @@ class X2GoListSessionsCache(object): raise x2go_exceptions.X2GoControlSessionException except x2go_exceptions.X2GoTimeOutException: pass + except KeyError: + pass def _update_sessions(self, profile_name, control_session): """\ @@ -201,6 +205,8 @@ class X2GoListSessionsCache(object): del self.x2go_listsessions_cache[profile_name] self.protected = False raise x2go_exceptions.X2GoControlSessionException + except KeyError: + pass def list_sessions(self, session_uuid): """\ 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).