[X2Go-Commits] x2gobroker.git - statusflag (branch) updated: 0.0.2.2-21-g57f6f46

[X2Go dev team]

The branch, statusflag has been updated
       via  57f6f46492bf568fbcc23c7fae84f57cff8b0971 (commit)
      from  36a3527b65295eb3e208fb03d065e3d8fadd124c (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 57f6f46492bf568fbcc23c7fae84f57cff8b0971
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Tue Jun 4 22:56:54 2013 +0200

    fix command line args in LOCAL agent mode

-----------------------------------------------------------------------

Summary of changes:
 x2gobroker/agent.py               |    2 +-
 x2gobroker/brokers/base_broker.py |    1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

The diff of changes is:
diff --git a/x2gobroker/agent.py b/x2gobroker/agent.py
index c97973f..2f2b2d2 100644
--- a/x2gobroker/agent.py
+++ b/x2gobroker/agent.py
@@ -70,7 +70,7 @@ def call_local_broker_agent(username, mode, cmdline_args=[]):
     ]
 
     for cmdline_arg in cmdline_args:
-        cmd_line.append('"{arg}"'.format(arg=cmdline_arg))
+        cmd_line.append('\'{arg}\''.format(arg=cmdline_arg))
 
     logger_broker.debug('Executing agent command locally: {cmd}'.format(cmd=" ".join(cmd_line)))
     agent_process = subprocess.Popen(cmd_line,
diff --git a/x2gobroker/brokers/base_broker.py b/x2gobroker/brokers/base_broker.py
index 6941eb4..52e68c6 100644
--- a/x2gobroker/brokers/base_broker.py
+++ b/x2gobroker/brokers/base_broker.py
@@ -855,6 +855,7 @@ class X2GoBroker(object):
                 agent_query_mode = ( remote_agent == u'LOCAL') and u'LOCAL' or u'SSH'
                 if remote_agent:
                     running_sessions, suspended_sessions = x2gobroker.agent.has_sessions(username, query_mode=agent_query_mode, remote_agent=remote_agent)
+
                     if set(profile['host']).intersection(set(running_sessions)): profile['status'] = u'R'
                     if set(profile['host']).intersection(set(suspended_sessions)): profile['status'] = u'S'
 


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).