The branch, master has been updated via 687fc56ef8103ed2404a29ad00d14e5e7eaf5cf7 (commit) from cf4527bfd7d98fc9c46339c61d1239522f9cbdf9 (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 687fc56ef8103ed2404a29ad00d14e5e7eaf5cf7 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Fri Mar 1 21:54:31 2013 +0100 more session auto-start fixes ----------------------------------------------------------------------- Summary of changes: lib/x2gobroker-agent.pl | 4 ++-- x2gobroker/agent.py | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) The diff of changes is: diff --git a/lib/x2gobroker-agent.pl b/lib/x2gobroker-agent.pl index 1b7c06a..e6f1d3b 100755 --- a/lib/x2gobroker-agent.pl +++ b/lib/x2gobroker-agent.pl @@ -60,7 +60,7 @@ sub AddAuthKey $authkeyfile =~ s/%h/$home/; $authkeyfile =~ s/%%/%/; - my $authkeydir = dirname($authkeyfile) + my $authkeydir = dirname($authkeyfile); # make sure dir and file for authorized_keys do exist if ( ! -d $authkeydir ) @@ -86,7 +86,7 @@ sub DelAuthKey $authkeyfile =~ s/%h/$home/; $authkeyfile =~ s/%%/%/; - my $authkeydir = dirname($authkeyfile) + my $authkeydir = dirname($authkeyfile); if( -e $authkeyfile ) { diff --git a/x2gobroker/agent.py b/x2gobroker/agent.py index 4ca299c..ba746bd 100644 --- a/x2gobroker/agent.py +++ b/x2gobroker/agent.py @@ -83,7 +83,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'] @@ -101,6 +101,7 @@ def call_remote_broker_agent(username, mode, cmdline_args=[], remote_agent=None) if ssh_transport.is_authenticated(): cmd = ' '.join(cmd_line) cmd = 'sh -c \"{cmd}\"'.format(cmd=cmd) + print cmd (stdin, stdout, stderr) = client.exec_command(cmd) result = stdout.read().split('\n') client.close() 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).