This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository x2gobroker. from f08552e fix Makefile new 17a90b5 remove debug output new cd7b19e x2gobroker-agent: fix interpretation of findbusyservers output The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: sbin/x2gobroker-testagent | 4 ++-- x2gobroker/agent.py | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2gobroker.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2gobroker. commit cd7b19e407eee81a838ed2686492c6d73af5fac2 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Wed Mar 19 10:39:00 2014 +0100 x2gobroker-agent: fix interpretation of findbusyservers output --- sbin/x2gobroker-testagent | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sbin/x2gobroker-testagent b/sbin/x2gobroker-testagent index ade4403..3d6b825 100755 --- a/sbin/x2gobroker-testagent +++ b/sbin/x2gobroker-testagent @@ -195,12 +195,12 @@ if __name__ == "__main__": print elif task.startswith('findbusyservers') and type(result) is types.DictType: if result: - print "\n".join(result.items()) + print "\n".join([ "{host} -- {usage}%".format(host=host, usage=usage) for host, usage in result.items() ]) else: print "X2Go Server busy state: All servers are idle." - print # even an empty dict means, that we have been successful... result = True + print if task == 'addauthkey' and result: on_host = " on {host}".format(host=cmdline_args.host) if cmdline_args.host != 'LOCAL' else "" -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2gobroker.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2gobroker. commit 17a90b5bd9a82fefd906acb9f07842a07efbf73d Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Wed Mar 19 10:38:38 2014 +0100 remove debug output --- x2gobroker/agent.py | 1 - 1 file changed, 1 deletion(-) diff --git a/x2gobroker/agent.py b/x2gobroker/agent.py index f8eed07..acc6e07 100644 --- a/x2gobroker/agent.py +++ b/x2gobroker/agent.py @@ -327,7 +327,6 @@ def find_busy_servers(username, query_mode='LOCAL', remote_agent=None, **kwargs) if server_list: if type(server_list) is types.ListType: for server_item in server_list: - print server_item if ':' in server_item: usage, server = server_item.split(':') server_usage.update({ server: int(usage) }) -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2gobroker.git
-
git-admin＠x2go.org