This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository python-x2go. commit 0a4c7738e227562c654c62a2e56c59835a6e788d Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Fri Oct 3 13:11:56 2014 +0200 Don't choke on non-initialized SSH transport objects when initializing SFTP client. --- debian/changelog | 2 ++ x2go/backends/control/plain.py | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 3ce4721..56f0739 100644 --- a/debian/changelog +++ b/debian/changelog @@ -100,6 +100,8 @@ python-x2go (0.5.0.0-0x2go1) UNRELEASED; urgency=low gracefully. - Handle sudden control session death during local folder sharing gracefully. + - Don't choke on non-initialized SSH transport objects when initializing + SFTP client. * debian/control: + Add dependencies: python-requests, python-simplejson. * python-x2go.spec: diff --git a/x2go/backends/control/plain.py b/x2go/backends/control/plain.py index 70f5ca2..ac2dcb3 100644 --- a/x2go/backends/control/plain.py +++ b/x2go/backends/control/plain.py @@ -275,7 +275,7 @@ class X2GoControlSession(paramiko.SSHClient): ssh_transport = self.get_transport() try: self.sftp_client = paramiko.SFTPClient.from_transport(ssh_transport) - except paramiko.SFTPError: + except (AttributeError, paramiko.SFTPError): raise x2go_exceptions.X2GoSFTPClientException('failed to initialize SFTP channel') def _x2go_sftp_put(self, local_path, remote_path): -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/python-x2go.git