[X2Go-Commits] x2gobroker.git - build-main (branch) updated: 0.0.0.1-68-g8030518
X2Go dev team
git-admin at x2go.org
Sun May 19 13:03:15 CEST 2013
The branch, build-main has been updated
via 8030518e4bab147e1f7b03feae7c63eff1f1f17c (commit)
from 93bd345a6cf4618b87d243c86988062c22ece0b4 (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 -----------------------------------------------------------------
-----------------------------------------------------------------------
Summary of changes:
x2gobroker/agent.py | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
The diff of changes is:
diff --git a/x2gobroker/agent.py b/x2gobroker/agent.py
index c9d2489..600a361 100644
--- a/x2gobroker/agent.py
+++ b/x2gobroker/agent.py
@@ -83,13 +83,16 @@ def call_remote_broker_agent(username, mode, remote_agent):
client.set_missing_host_key_policy(paramiko.WarningPolicy)
client.connect(remote_hostname, remote_port, remote_username, look_for_keys=True, allow_agent=True)
+ result = []
ssh_transport = client.get_transport()
if ssh_transport.is_authenticated():
- cmd = cmd_line.join(' ')
+ cmd = ' '.join(cmd_line)
cmd = 'sh -c \"{cmd}\"'.format(cmd=cmd)
(stdin, stdout, stderr) = client.exec_command(cmd)
+ result = stdout.read().split('\n')
client.close()
- return stdout.read().split('\n')
+ if result and result[0].startswith('OK'):
+ return [ r for r in result[1:] if r ]
except paramiko.SSHException:
logger_error.error('could not connect to remote X2Go Broker Agent (user: {user}, hostname: {hostname}, port: {port}'.format(user=remote_username, hostname=remote_hostname, port=remote_port))
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).
More information about the x2go-commits
mailing list