[X2Go-Commits] python-x2go.git - master (branch) updated: 0.4.0.6-6-g963eaed

X2Go dev team git-admin at x2go.org
Wed Jul 31 09:33:40 CEST 2013


The branch, master has been updated
       via  963eaed8dba7cb7444bd18d847c630bfb53c39fe (commit)
      from  7d7ec5f25b879a38a6fa638242c84f2764698dc8 (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 963eaed8dba7cb7444bd18d847c630bfb53c39fe
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Wed Jul 31 09:31:40 2013 +0200

    Ignore non-registered session UUIDs in X2GoClient.clean_sessions() method.

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

Summary of changes:
 debian/changelog |    2 +-
 x2go/client.py   |    8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 98bdaf7..f29b9bf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,10 +2,10 @@ python-x2go (0.4.0.7-0~x2go1) UNRELEASED; urgency=low
 
   * New upstream version (0.4.0.7):
     - Drop duplicate method in terminal backend: is_desktop_session().
+    - Ignore non-registered session UUIDs in X2GoClient.clean_sessions() method.
   * /debian/control:
     + Replace LDAP support with session brokerage support in LONG_DESCRIPTION.
 
-
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Sun, 28 Jul 2013 19:48:57 +0200
 
 python-x2go (0.4.0.6-0~x2go1) unstable; urgency=low
diff --git a/x2go/client.py b/x2go/client.py
index d554635..a3ff64d 100644
--- a/x2go/client.py
+++ b/x2go/client.py
@@ -2558,8 +2558,12 @@ class X2GoClient(object):
 
         """
         _destroy_terminals = not ( self.auto_update_sessionregistry == True)
-        session = self.session_registry(session_uuid)
-        session.clean_sessions(destroy_terminals=_destroy_terminals, published_applications=published_applications)
+        try:
+            session = self.session_registry(session_uuid)
+            session.clean_sessions(destroy_terminals=_destroy_terminals, published_applications=published_applications)
+        except x2go_exceptions.X2GoSessionRegistryException:
+            # silently ignore a non-registered session UUID (mostly occurs during disconnects)
+            pass
     __clean_sessions = clean_sessions
 
     def list_sessions(self, session_uuid=None,


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