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

X2Go dev team git-admin at x2go.org
Wed Jan 8 15:31:22 CET 2014


The branch, build-baikal has been updated
       via  dcf2f7a347ceb98d7d9713fa4815b8183a13d5b9 (commit)
      from  6445a869c0d6c857450ebbae46186b810e59911a (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  |    2 ++
 x2go/_paramiko.py |    3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 384e7eb..a7534ef 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -40,6 +40,8 @@ python-x2go (0.2.1.0-0~x2go1) UNRELEASED; urgency=low
     - Give the session window more time to appear.
     - Catch rare condition in utils.find_session_window in case where
       the list of window IDs is not available.
+    - Disable SSH agent forwarding on MS Windows platform for current
+      versions of Python Paramiko.
   * /debian/rules:
     + Allow package build on systems with missing dh_python2.
   * /debian/control:
diff --git a/x2go/_paramiko.py b/x2go/_paramiko.py
index 5124b35..b1e57c5 100644
--- a/x2go/_paramiko.py
+++ b/x2go/_paramiko.py
@@ -23,11 +23,12 @@ Monkey Patch and feature map for Python Paramiko
 """
 
 import paramiko
+import platform
 from utils import compare_versions
 
 PARAMIKO_VERSION = paramiko.__version__.split()[0]
 PARAMIKO_FEATURE = {
-    'forward-ssh-agent': compare_versions(PARAMIKO_VERSION, ">=", '1.8.0'),
+    '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'),


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