[X2Go-Commits] x2gobroker.git - tmp (branch) updated: 0.0.0.5-60-gea18937

[X2Go dev team]

The branch, tmp has been updated
       via  ea189372b4d143c6937ffb5a682a9ba0c3eb281c (commit)
      from  63ca4fa3a6bccff85f1ebc51548cd8a1b95c62af (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 |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

The diff of changes is:
diff --git a/x2gobroker/agent.py b/x2gobroker/agent.py
index 6b4a251..9b63f00 100644
--- a/x2gobroker/agent.py
+++ b/x2gobroker/agent.py
@@ -109,7 +109,10 @@ def call_remote_broker_agent(username, mode, cmdline_args=[], remote_agent=None)
 
     remote_username = x2gobroker.defaults.X2GOBROKER_AGENT_USER
     remote_hostname = remote_agent[u'hostname']
-    remote_port = int(remote_agent[u'port'])
+    if remote_agent.has_key(u'port'):
+        remote_port = int(remote_agent[u'port'])
+    else:
+        remote_port = 22
 
     # now, connect and use paramiko Client to negotiate SSH2 across the connection
     try:


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