This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2gobroker. commit 910f046a57e96236c926dba1a24a361be128aad8 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Fri Jul 11 13:45:10 2014 +0200 Make sure find_busy_servers in agent.py returns a tuple (recent API change) to not break profiles with multiple servers. (Fixes: #545). --- debian/changelog | 2 ++ x2gobroker/agent.py | 5 ++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index f662963..d3c9000 100644 --- a/debian/changelog +++ b/debian/changelog @@ -186,6 +186,8 @@ x2gobroker (0.0.3.0-0x2go1) UNRELEASED; urgency=low - Add basic support for pulling https_get authmech config from configuration file. (Fixes: #470). - Fix typos and host/port mixups in the remote_sshproxy logic. (Fixes: #544). + - Make sure find_busy_servers in agent.py returns a tuple (recent API change) + to not break profiles with multiple servers. (Fixes: #545). -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Fri, 07 Jun 2013 23:25:30 +0200 diff --git a/x2gobroker/agent.py b/x2gobroker/agent.py index 9cb645a..2b6a873 100644 --- a/x2gobroker/agent.py +++ b/x2gobroker/agent.py @@ -337,12 +337,15 @@ def find_busy_servers(username, remote_agent=None, **kwargs): if server_list: if type(server_list) is types.ListType: + _success = True for server_item in server_list: if ':' in server_item: usage, server = server_item.split(':') server_usage.update({ server: int(usage) }) + else: + _success = False - return server_usage + return (_success, server_usage) tasks['findbusyservers'] = find_busy_servers -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2gobroker.git