[X2Go-Commits] [python-x2go] 01/02: more work on transport lock release

git-admin at x2go.org git-admin at x2go.org
Tue Oct 7 14:13:06 CEST 2014


This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository python-x2go.

commit 9fd867a6435e5949312e0c518970a5611d4f7545
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Tue Oct 7 14:11:39 2014 +0200

    more work on transport lock release
---
 x2go/backends/control/plain.py |    3 +++
 1 file changed, 3 insertions(+)

diff --git a/x2go/backends/control/plain.py b/x2go/backends/control/plain.py
index b77d138..0bd08ff 100644
--- a/x2go/backends/control/plain.py
+++ b/x2go/backends/control/plain.py
@@ -299,6 +299,7 @@ class X2GoControlSession(paramiko.SSHClient):
             try:
                 self.sftp_client = paramiko.SFTPClient.from_transport(ssh_transport)
             except paramiko.SFTPError:
+                self._transport_lock.release()
                 raise x2go_exceptions.X2GoSFTPClientException('failed to initialize SFTP channel')
             try:
                 self.sftp_client.put(os.path.normpath(local_path), remote_path)
@@ -331,6 +332,7 @@ class X2GoControlSession(paramiko.SSHClient):
             try:
                 self.sftp_client = paramiko.SFTPClient.from_transport(ssh_transport)
             except paramiko.SFTPError:
+                self._transport_lock.release()
                 raise x2go_exceptions.X2GoSFTPClientException('failed to initialize SFTP channel')
             try:
                 remote_fileobj = self.sftp_client.open(remote_path, 'w')
@@ -364,6 +366,7 @@ class X2GoControlSession(paramiko.SSHClient):
             try:
                 self.sftp_client = paramiko.SFTPClient.from_transport(ssh_transport)
             except paramiko.SFTPError:
+                self._transport_lock.release()
                 raise x2go_exceptions.X2GoSFTPClientException('failed to initialize SFTP channel')
             try:
                 self.sftp_client.remove(remote_path)

--
Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/python-x2go.git


More information about the x2go-commits mailing list