The branch, twofactorauth has been updated via dafc0ae55b24ce750d2e5edea6db79d394e61185 (commit) from 2c39d868a8f5fc57a66e5d2ad88e0a10c600f97d (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: x2go/registry.py | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) The diff of changes is: diff --git a/x2go/registry.py b/x2go/registry.py index 2df122e..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 X2goSessionRegistryException('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': 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).