[X2Go-Commits] python-x2go.git - build-baikal (branch) updated: 0.4.0.3-6-gb433567

X2Go dev team git-admin at x2go.org
Tue Jun 18 20:29:06 CEST 2013


The branch, build-baikal has been updated
       via  b4335679fa7400e2e57c3992f9f25c4d1b719f3c (commit)
      from  5b554af5af1a2521f5d1070ea21ef4d3bf46036d (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:
 debian/changelog  |    4 +++-
 x2go/_paramiko.py |    8 +++++---
 2 files changed, 8 insertions(+), 4 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index c191470..589f0b9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,7 +5,9 @@ python-x2go (0.4.0.4-0~x2go1) UNRELEASED; urgency=low
       if the session profile parameter restoreexports is set.
     - Fix the restoreexports logic on mount/unmount/unmount all requests.
       Make sure client-side offline network shares do not get purged from the
-      session profile configuration if unavailable. (Fixes: #192). 
+      session profile configuration if unavailable. (Fixes: #192).
+    - Become aware of fixed paramiko features since paramiko 1.11.0. Stop
+      monkey patching those methods that got fixed in 1.11.0.
 
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Sun, 21 Apr 2013 23:21:29 +0200
 
diff --git a/x2go/_paramiko.py b/x2go/_paramiko.py
index 3b93d14..dd83bd0 100644
--- a/x2go/_paramiko.py
+++ b/x2go/_paramiko.py
@@ -31,13 +31,13 @@ PARAMIKO_FEATURE = {
     'forward-ssh-agent': compare_versions(PARAMIKO_VERSION, ">=", '1.8.0') and (platform.system() != "Windows"),
     'use-compression': compare_versions(PARAMIKO_VERSION, ">=", '1.7.7.1'),
     'hash-host-entries': compare_versions(PARAMIKO_VERSION, ">=", '99'),
-    'host-entries-reloadable': compare_versions(PARAMIKO_VERSION, ">=", '99'),
-    'preserve-known-hosts': compare_versions(PARAMIKO_VERSION, ">=", '99'),
+    'host-entries-reloadable': compare_versions(PARAMIKO_VERSION, ">=", '1.11.0'),
+    'preserve-known-hosts': compare_versions(PARAMIKO_VERSION, ">=", '1.11.0'),
 }
 
 def _SSHClient_save_host_keys(self, filename):
     """\
-    FIXME!!! --- this method should become part of Paramiko
+    Available since paramiko 1.11.0...
 
     This method has been taken from SSHClient class in Paramiko and
     has been improved and adapted to latest SSH implementations.
@@ -71,6 +71,8 @@ def _SSHClient_save_host_keys(self, filename):
 
 def _HostKeys_load(self, filename):
     """\
+    Available since paramiko 1.11.0...
+
     Read a file of known SSH host keys, in the format used by openssh.
     This type of file unfortunately doesn't exist on Windows, but on
     posix, it will usually be stored in


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