The branch, master has been updated via ae5433d8653adaa364329001aa10f55d76f15a65 (commit) from 324b5abc92c9c242ebb6410b3938232055b73920 (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 ae5433d8653adaa364329001aa10f55d76f15a65 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Wed Sep 25 13:02:53 2013 +0200 retrieve session profile in get_agent_query_mode() ----------------------------------------------------------------------- Summary of changes: x2gobroker/brokers/base_broker.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/x2gobroker/brokers/base_broker.py b/x2gobroker/brokers/base_broker.py index 380e479..f98f984 100644 --- a/x2gobroker/brokers/base_broker.py +++ b/x2gobroker/brokers/base_broker.py @@ -462,7 +462,7 @@ class X2GoBroker(object): return unicode(_auth_mech) or unicode(_default_auth_mech) - def get_agent_query_mode(self): + def get_agent_query_mode(self, profile_id): """\ Get the agent query mode (LOCAL or SSH, normally) that is configured for this X2Go Session Broker instance. @@ -475,6 +475,7 @@ class X2GoBroker(object): _backend_agent_query_mode = "" _agent_query_mode = "" + _profile = self.get_profile_broker(profile_id) if _profile and _profile.has_key(u'broker-agent-query-mode') and _profile['broker-agent-query-mode']: _agent_query_mode = _profile[u'broker-agent-query-mode'] logger_broker.debug('base_broker.X2GoBroker.get_agent_query_mode(): found broker-agent-query-mode in session profile with ID {id}: {value}. This one has precendence over the default and the backend value.'.format(id=profile_id, value=_authorized_keys_file)) @@ -500,6 +501,7 @@ class X2GoBroker(object): """ _default_session_autologin = False _session_autologin = False + _profile = self.get_profile_broker(profile_id) if _profile and _profile.has_key(u'broker-session-autologin') and _profile['broker-session-autologin']: _session_autologin = _profile[u'broker-session-autologin'] @@ -807,7 +809,7 @@ class X2GoBroker(object): """ remote_agent = None - agent_query_mode = self.get_agent_query_mode().upper() + agent_query_mode = self.get_agent_query_mode(profile_id).upper() if agent_query_mode == u'SSH': profile = self.get_profile(profile_id) hooks/post-receive -- x2gobroker.git (HTTP(S) Session broker for X2Go) 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 "x2gobroker.git" (HTTP(S) Session broker for X2Go).