[X2Go-Commits] [x2gobroker] 01/01: agent/call_remote_broker_agent: fix quoting for the remote command

git-admin at x2go.org git-admin at x2go.org
Thu Mar 20 09:22:08 CET 2014


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

x2go pushed a commit to branch master
in repository x2gobroker.

commit 902de4c2e9aa15246a02170435f499a8d4644a42
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Thu Mar 20 09:22:01 2014 +0100

    agent/call_remote_broker_agent: fix quoting for the remote command
---
 x2gobroker/agent.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/x2gobroker/agent.py b/x2gobroker/agent.py
index 0e035fa..01c92d7 100644
--- a/x2gobroker/agent.py
+++ b/x2gobroker/agent.py
@@ -142,7 +142,7 @@ def call_remote_broker_agent(username, mode, cmdline_args=[], remote_agent=None)
     ]
 
     for cmdline_arg in cmdline_args:
-        cmd_line.append('{arg}'.format(arg=cmdline_arg))
+        cmd_line.append('"{arg}"'.format(arg=cmdline_arg))
 
     remote_username = x2gobroker.defaults.X2GOBROKER_AGENT_USER
     remote_hostname = remote_agent[u'hostname']
@@ -164,7 +164,7 @@ def call_remote_broker_agent(username, mode, cmdline_args=[], remote_agent=None)
         ssh_transport = client.get_transport()
         if ssh_transport and ssh_transport.is_authenticated():
             cmd = ' '.join(cmd_line)
-            cmd = 'sh -c \"{cmd}\"'.format(cmd=cmd)
+            cmd = 'sh -c \'{cmd}\''.format(cmd=cmd)
             logger_broker.info('Executing agent command on remote host ({remote_agent}): {cmd}'.format(remote_agent=remote_agent['hostname'], cmd=cmd))
             (stdin, stdout, stderr) = client.exec_command(cmd)
             result = stdout.read().split('\n')

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



More information about the x2go-commits mailing list