The branch, twofactorauth has been updated via 97d719a9381976c7878ecb95b9292b78366e2608 (commit) from 81ed5e7d2886aa67e03655d3669011096b4c944e (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 ----------------------------------------------------------------- commit 97d719a9381976c7878ecb95b9292b78366e2608 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Fri Oct 4 16:12:22 2013 +0200 No Unicode chars in log messages. Eliminated one more in checkhosts.py. Conflicts (resolved by Mike Gabriel): debian/changelog ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + x2go/checkhosts.py | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index ea4e5c4..017ae15 100644 --- a/debian/changelog +++ b/debian/changelog @@ -17,6 +17,7 @@ python-x2go (0.4.0.9-0~x2go1) UNRELEASED; urgency=low - Implement two-factor authentication. - Compat fix in _paramiko monkey patch module to also work with early Paramiko versions. + - No Unicode chars in log messages. Eliminated one more in checkhosts.py. -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Wed, 07 Aug 2013 12:18:46 +0200 diff --git a/x2go/checkhosts.py b/x2go/checkhosts.py index 192850a..abebdd9 100644 --- a/x2go/checkhosts.py +++ b/x2go/checkhosts.py @@ -216,7 +216,7 @@ class X2GoInteractiveAddPolicy(X2GoMissingHostKeyPolicy): if self.session_instance.control_session.unique_hostkey_aliases: our_server_key = client._host_keys.get(self.session_instance.get_profile_id(), {}).get(keytype, None) if our_server_key is not None: - self.session_instance.logger('SSH host key verification for SSH-proxied host %s with %s fingerprint ,,%s\'\' succeeded. This host is known by the X2Go session profile ID of profile »%s«.' % (self.fake_hostname, self.get_key_name(), self.get_key_fingerprint_with_colons(), self.session_instance.profile_name), loglevel=log.loglevel_NOTICE) + self.session_instance.logger('SSH host key verification for SSH-proxied host %s with %s fingerprint ,,%s\'\' succeeded. This host is known by the X2Go session profile ID of profile ,,%s\'\'.' % (self.fake_hostname, self.get_key_name(), self.get_key_fingerprint_with_colons(), self.session_instance.profile_name), loglevel=log.loglevel_NOTICE) return else: our_server_key = client._host_keys.get(self.fake_hostname, {}).get(keytype, None) 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).