[X2Go-Commits] python-x2go.git - build-baikal (branch) updated: 0.0.36.1-31-gd280d9a
X2Go dev team
git-admin at x2go.org
Wed Jan 8 15:25:59 CET 2014
The branch, build-baikal has been updated
via d280d9aa51efa5f8041ab9577ece5db3c550b9cf (commit)
from 997fa26a99417759d36dcb17a53f4f4fdefc8de6 (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/backends/terminal/_stdout.py | 1 +
x2go/sftpserver.py | 3 ++-
2 files changed, 3 insertions(+), 1 deletion(-)
The diff of changes is:
diff --git a/x2go/backends/terminal/_stdout.py b/x2go/backends/terminal/_stdout.py
index 224fea9..89d429b 100644
--- a/x2go/backends/terminal/_stdout.py
+++ b/x2go/backends/terminal/_stdout.py
@@ -437,6 +437,7 @@ class X2goTerminalSessionSTDOUT(object):
_tunnel = sftpserver.X2goRevFwTunnelToSFTP(server_port=self.session_info.sshfs_port,
ssh_transport=ssh_transport,
auth_key=self.control_session._x2go_session_auth_rsakey,
+ session_instance=self.session_instance,
logger=self.logger
)
diff --git a/x2go/sftpserver.py b/x2go/sftpserver.py
index c8697d6..79e335d 100644
--- a/x2go/sftpserver.py
+++ b/x2go/sftpserver.py
@@ -359,7 +359,7 @@ class X2goRevFwTunnelToSFTP(rforward.X2goRevFwTunnel):
from within the the remote X2go server session.
"""
- def __init__(self, server_port, ssh_transport, auth_key=None, logger=None, loglevel=log.loglevel_DEFAULT):
+ def __init__(self, server_port, ssh_transport, auth_key=None, session_instance=None, logger=None, loglevel=log.loglevel_DEFAULT):
"""\
Start a Paramiko/SSH reverse forwarding tunnel, that has an sFTP server listening at
the end point of the tunnel.
@@ -388,6 +388,7 @@ class X2goRevFwTunnelToSFTP(rforward.X2goRevFwTunnel):
self.server_port = server_port
self.ssh_transport = ssh_transport
+ self.session_instance = session_instance
if type(auth_key) is not paramiko.RSAKey:
auth_key = None
self.auth_key = auth_key
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