The branch, build-main has been updated via 5d875b72fa48d6390993a5b445ae6687ac78341e (commit) via dafc0ae55b24ce750d2e5edea6db79d394e61185 (commit) 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 | 10 ++++++++++ x2go/client.py | 7 +++++-- x2go/registry.py | 16 ++++------------ x2go/session.py | 1 - 4 files changed, 19 insertions(+), 15 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 380637e..0805825 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +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. + - Fix desktop sharing. + + -- Mike Gabriel <mike.gabriel@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..c4073ca 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): @@ -1182,7 +1185,7 @@ class X2goClient(object): _desktop = desktop or "%s@%s" % (user, display) # X2goClient.list_desktops() uses caching (if enabled, so we prefer lookups here... - if _desktop not in self.list_desktops(session_uuid): + if not _desktop in self._X2goClient__list_desktops(session_uuid): raise x2go_exceptions.X2goDesktopSharingException('No such desktop ID: %s' % _desktop) return self.session_registry(session_uuid).share_desktop(desktop=desktop, user=user, display=display, share_mode=share_mode, check_desktop_list=False) diff --git a/x2go/registry.py b/x2go/registry.py index 5be0d1d..304aa97 100644 --- a/x2go/registry.py +++ b/x2go/registry.py @@ -455,8 +455,8 @@ class X2goSessionRegistry(object): self.logger('using already initially-registered yet-unused session %s' % session_uuid, loglevel=log.loglevel_NOTICE) return session_uuid - try: - session_uuid = self.get_session_of_session_name(session_name) + session_uuid = self.get_session_of_session_name(session_name) + if session_uuid is not None: _params = self.client_instance.session_profiles.to_session_params(profile_id) self(session_uuid).update_params(_params) @@ -465,10 +465,6 @@ class X2goSessionRegistry(object): self.logger('using already registered-by-session-name session %s' % session_uuid, loglevel=log.loglevel_NOTICE) return session_uuid - except X2goSessionException: - # no registered session for session_name found... FINE, go ahead! - pass - s = session.X2goSession(server=server, control_session=control_session, profile_id=profile_id, profile_name=profile_name, session_name=session_name, @@ -507,11 +503,7 @@ class X2goSessionRegistry(object): @rtype: C{bool} """ - try: - _dummy = self.get_session_of_session_name(session_name) - return True - except X2goSessionException: - return False + return bool(self.get_session_of_session_name(session_name)) def get_session_of_session_name(self, session_name, return_object=False): """\ @@ -535,7 +527,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) + return None def _sessionsWithState(self, state, return_objects=True, return_profile_names=False, return_profile_ids=False, return_session_names=False): if state == 'associated': diff --git a/x2go/session.py b/x2go/session.py index cfc8770..9439477 100644 --- a/x2go/session.py +++ b/x2go/session.py @@ -1066,7 +1066,6 @@ class X2goSession(object): logger=self.logger, **self.terminal_params) if self.has_terminal_session(): - self.terminal_session = _terminal self.session_name = self.terminal_session.session_info.name # shared desktop sessions get their startup command set by the control 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).