[X2Go-Commits] python-x2go.git - twofactorauth (branch) updated: 0.2.0.10-93-g901b388
X2Go dev team
git-admin at x2go.org
Sat Sep 14 15:57:54 CEST 2013
The branch, twofactorauth has been updated
via 901b38885619f6f4a16a42b17633de61d531427a (commit)
from 64dbd1b29eeefb88427ee92a5ba0ccfef2cb309f (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, 4 insertions(+), 4 deletions(-)
The diff of changes is:
diff --git a/x2go/session.py b/x2go/session.py
index e1159f1..bca32ec 100644
--- a/x2go/session.py
+++ b/x2go/session.py
@@ -1113,19 +1113,19 @@ class X2goSession(object):
# do we have a key file passed as control parameter?
if self.control_params.has_key('key_filename') and self.control_params['key_filename'] and os.path.exists(os.path.normpath(self.control_params['key_filename'])):
- return (_can_sshproxy_auto_connect is not None) or _can_sshproxy_auto_connect
+ return (_can_sshproxy_auto_connect is None) or _can_sshproxy_auto_connect
# or a private key?
elif self.control_params.has_key('pkey') and self.control_params['pkey']:
- return (_can_sshproxy_auto_connect is not None) or _can_sshproxy_auto_connect
+ return (_can_sshproxy_auto_connect is None) or _can_sshproxy_auto_connect
# or a key auto discovery?
elif self.control_params.has_key('look_for_keys') and self.control_params['look_for_keys'] and (os.path.exists(os.path.expanduser('~/.ssh/id_rsa')) or os.path.exists(os.path.expanduser('~/.ssh/id_dsa'))):
- return (_can_sshproxy_auto_connect is not None) or _can_sshproxy_auto_connect
+ return (_can_sshproxy_auto_connect is None) or _can_sshproxy_auto_connect
# or an SSH agent usage?
elif self.control_params.has_key('allow_agent') and self.control_params['allow_agent'] and paramiko.Agent().get_keys():
- return (_can_sshproxy_auto_connect is not None) or _can_sshproxy_auto_connect
+ return (_can_sshproxy_auto_connect is None) or _can_sshproxy_auto_connect
else:
return False
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).
More information about the x2go-commits
mailing list