[X2Go-Commits] [x2gobroker] 02/03: agent.py: Fix missing "task" parameter for task "ping" against a local broker agent.

git-admin at x2go.org git-admin at x2go.org
Mon Apr 13 12:55:47 CEST 2015


This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository x2gobroker.

commit 268b56645099e7789867921cc20bb5b286ed815f
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Mon Apr 13 12:53:52 2015 +0200

    agent.py: Fix missing "task" parameter for task "ping" against a local broker agent.
---
 debian/changelog    |    2 ++
 x2gobroker/agent.py |    2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 4ea77f2..970a03c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -322,6 +322,8 @@ x2gobroker (0.0.3.0-0x2go1) UNRELEASED; urgency=low
     - Implement "not-set" value for X2Go Client parameters. If a parameter
       is set to "not-set", the parameter won't be handed over to X2Go Client.
       (Fixes: #836).
+    - agent.py: Fix missing "task" parameter for task "ping" against a local
+      broker agent.
   * debian/control:
     + Provide separate bin:package for SSH brokerage: x2gobroker-ssh.
     + Replace LDAP support with session brokerage support in LONG_DESCRIPTION.
diff --git a/x2gobroker/agent.py b/x2gobroker/agent.py
index ef6024a..760d2d2 100644
--- a/x2gobroker/agent.py
+++ b/x2gobroker/agent.py
@@ -279,7 +279,7 @@ def ping(remote_agent=None, logger=None, **kwargs):
 
     username='foo'
     if remote_agent is None:
-        return _call_local_broker_agent(username, logger=logger)[0]
+        return _call_local_broker_agent(username, task='ping', logger=logger)[0]
     else:
         return remote_agent is not None and \
                (x2gobroker.utils.portscan(remote_agent['hostaddr'], remote_agent['port']) or x2gobroker.utils.portscan(remote_agent['hostname'], remote_agent['port'])) and \

--
Alioth's /srv/git/code.x2go.org/x2gobroker.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2gobroker.git


More information about the x2go-commits mailing list