[X2Go-Commits] python-x2go.git - brokerclient (branch) updated: 0.1.1.1-1-g2c39d86

[X2Go dev team]

The branch, brokerclient has been updated
       via  2c39d868a8f5fc57a66e5d2ad88e0a10c600f97d (commit)
      from  4f78eea77d14fad10eab3c4e604945117eaee80e (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 |    9 +++++++++
 x2go/client.py   |    5 ++++-
 x2go/registry.py |    2 +-
 3 files changed, 14 insertions(+), 2 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 380637e..81061c2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+python-x2go (0.1.1.2-0~x2go1) UNRELEASED; urgency=low
+
+  * New upstream version (0.1.1.2):
+    - bugfix version
+    - Use X2goRegistryException for session query for non-existing sessions.
+    - Catch this exception in X2goClient.
+
+ -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Fri, 24 Jun 2011 16:42:20 +0200
+
 python-x2go (0.1.1.1-0~x2go1) unstable; urgency=low
 
   * New bugfix version (0.1.1.1):
diff --git a/x2go/client.py b/x2go/client.py
index dbe19d7..1d71657 100644
--- a/x2go/client.py
+++ b/x2go/client.py
@@ -984,7 +984,10 @@ class X2goClient(object):
         @rtype: C{str} or L{X2goSession} instance
 
         """
-        return self.session_registry.get_session_of_session_name(session_name=session_name, return_object=return_object)
+        try:
+            return self.session_registry.get_session_of_session_name(session_name=session_name, return_object=return_object)
+        except X2goSessionExceptionRegistryException:
+            return None
     __get_session_of_session_name = get_session_of_session_name
 
     def get_session_name(self, session_uuid):
diff --git a/x2go/registry.py b/x2go/registry.py
index 5be0d1d..2df122e 100644
--- a/x2go/registry.py
+++ b/x2go/registry.py
@@ -535,7 +535,7 @@ class X2goSessionRegistry(object):
         elif len(found_sessions) > 1:
             raise X2goSessionRegistryException('there should only be one registered session of name ,,%s\'\'' % session_name)
         else:
-            raise X2goSessionException('no session of name ,,%s\'\' registered' % session_name)
+            raise X2goSessionRegistryException('no session of name ,,%s\'\' registered' % session_name)
 
     def _sessionsWithState(self, state, return_objects=True, return_profile_names=False, return_profile_ids=False, return_session_names=False):
         if state == 'associated':


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).