The branch, master has been updated via 02413b4ef4e3b0441715a298b9c23974489b677e (commit) from b002295e8bf2023d7c97ce990f4c42514eb56cbd (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 02413b4ef4e3b0441715a298b9c23974489b677e Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Wed Sep 25 11:58:34 2013 +0200 fine-tune session profile based agent-query-mode ----------------------------------------------------------------------- Summary of changes: x2gobroker/brokers/base_broker.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) The diff of changes is: diff --git a/x2gobroker/brokers/base_broker.py b/x2gobroker/brokers/base_broker.py index 70242d2..66698ab 100644 --- a/x2gobroker/brokers/base_broker.py +++ b/x2gobroker/brokers/base_broker.py @@ -472,6 +472,7 @@ class X2GoBroker(object): """ _default_agent_query_mode = "LOCAL" + _backend_agent_query_mode = "" _agent_query_mode = "" if _profile and _profile.has_key(u'broker-agent-query-mode') and _profile['broker-agent-query-mode']: @@ -479,14 +480,14 @@ class X2GoBroker(object): 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)) elif self.config.has_value(self.backend_name, 'agent-query-mode') and self.config.get_value(self.backend_name, 'agent-query-mode'): - _agent_query_mode = self.config.get_value(self.backend_name, 'agent-query-mode').lower() + _backend_agent_query_mode = self.config.get_value(self.backend_name, 'agent-query-mode').lower() logger_broker.debug('base_broker.X2GoBroker.get_agent_query_mode(): found agent-query-mode in backend config section »{backend}«: {value}. This one has precendence over the default value.'.format(backend=self.backend_name, value=_agent_query_mode)) - elif self.config.has_value('global', 'default-agent-query-mode'): + elif self.config.has_value('global', 'default-agent-query-mode') and self.config.get_value('global', 'default-agent-query-mode'): _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(_default_agent_query_mode) + return unicode(_agent_query_mode) or unicode(_backend_agent_query_mode) unicode(_default_agent_query_mode) def use_session_autologin(self, 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).