[X2Go-Commits] python-x2go.git - build-baikal (branch) updated: 0.2.0.10-80-gb4b82d6

[X2Go dev team]

The branch, build-baikal has been updated
       via  b4b82d69db5599877036a014a7494bffb39e527f (commit)
      from  dd46f32662d19394bd2a495a1817068a04e11253 (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:
 x2go/session.py |   10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

The diff of changes is:
diff --git a/x2go/session.py b/x2go/session.py
index 92c911e..da67aaf 100644
--- a/x2go/session.py
+++ b/x2go/session.py
@@ -1224,13 +1224,17 @@ class X2goSession(object):
             if self.sshproxy_reuse_authinfo:
                 if self.control_params.has_key('key_filename'):
                     self.sshproxy_params['sshproxy_key_filename'] = self.control_params['key_filename']
-                if _params.has_key('pkey'):
+                if self.control_params.has_key('pkey'):
                     self.sshproxy_params['sshproxy_pkey'] = self.control_params['pkey']
-                if _params.has_key('password'):
+                if self.control_params.has_key('password'):
                     self.sshproxy_params['sshproxy_password'] = self.control_params['password']
-                if _params.has_key('password'):
+                if self.control_params.has_key('password'):
                     self.sshproxy_params['sshproxy_password'] = self.control_params['password']
 
+            _params = {}
+            _params.update(self.control_params)
+            _params.update(self.sshproxy_params)
+
             if 'port' not in _params:
                 _params['port'] = self.port
 


hooks/post-receive
-- 
python-x2go.git (Python X2Go Client API)

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 "python-x2go.git" (Python X2Go Client API).