The branch, twofactorauth has been updated via 54e4dbcf1b1b740eb5fff25d8f308a4331ba616f (commit) from 384130ba3e22a2ea7c3c4d021f1e7e22a072727b (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 | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) The diff of changes is: diff --git a/x2go/session.py b/x2go/session.py index c7bda03..0348ae3 100644 --- a/x2go/session.py +++ b/x2go/session.py @@ -1215,10 +1215,6 @@ class X2goSession(object): if sshproxy_reuse_authinfo is not None: self.sshproxy_reuse_authinfo = sshproxy_reuse_authinfo - _params = {} - _params.update(self.control_params) - _params.update(self.sshproxy_params) - if username: self.control_params['username'] = username if add_to_known_hosts is not None: @@ -1229,9 +1225,9 @@ class X2goSession(object): self.control_params['look_for_keys'] = look_for_keys if allow_agent is not None: self.control_params['allow_agent'] = allow_agent + if sshproxy_user: self.sshproxy_params['sshproxy_user'] = sshproxy_user - if sshproxy_password: self.sshproxy_params['sshproxy_password'] = sshproxy_password @@ -1244,8 +1240,6 @@ class X2goSession(object): self.sshproxy_params['sshproxy_pkey'] = self.control_params['pkey'] if self.control_params.has_key('password'): self.sshproxy_params['sshproxy_password'] = self.control_params['password'] - if self.control_params.has_key('password'): - self.sshproxy_params['sshproxy_password'] = self.control_params['password'] _params = {} _params.update(self.control_params) 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).