This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2gobroker. commit 747f36afae3e31abc5dc874d3313a0a50b90afdb Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Wed Apr 1 10:00:04 2015 +0200 fix for 04e5defd3089db9075501a99624f64c9926bedb5 --- x2gobroker/brokers/base_broker.py | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/x2gobroker/brokers/base_broker.py b/x2gobroker/brokers/base_broker.py index fa89ccd..407db5c 100644 --- a/x2gobroker/brokers/base_broker.py +++ b/x2gobroker/brokers/base_broker.py @@ -546,11 +546,6 @@ class X2GoBroker(object): _backend_agent_query_mode = "" _agent_query_mode = "" - # if the frontend overrides the agent query mode, immediately return it here... - if self._enforce_agent_query_mode(mode=_mode): - logger_broker.debug('base_broker.X2GoBroker.get_agent_query_mode(): broker frontend overrides configured agent query mode, using mode agent query mode "{mode}".'.format(mode=_agent_query_mode)) - return self._enforce_agent_query_mode(mode=_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'] @@ -564,7 +559,15 @@ class X2GoBroker(object): _default_agent_query_mode = self.config.get_value('global', 'default-agent-query-mode').lower() logger_broker.debug('base_broker.X2GoBroker.get_agent_query_mode(): found default-agent-query-mode in global config section: {value}'.format(value=_default_agent_query_mode)) - return unicode(_agent_query_mode) or unicode(_backend_agent_query_mode) or unicode(_default_agent_query_mode) + _mode = unicode(_agent_query_mode) or unicode(_backend_agent_query_mode) or unicode(_default_agent_query_mode) + + # if the frontend overrides the agent query mode, immediately return it here... + if self._enforce_agent_query_mode(mode=_mode): + _new_mode = self._enforce_agent_query_mode(mode=_mode) + logger_broker.debug('base_broker.X2GoBroker.get_agent_query_mode(): broker frontend overrides configured agent query mode ("{mode}"), using mode agent query mode: "{new_mode}".'.format(mode=_mode, new_mode=_new_mode)) + return _new_mode + else: + return _mode def get_session_autologin(self, profile_id): """\ -- Alioth's /srv/git/code.x2go.org/x2gobroker.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2gobroker.git