The branch, master has been updated via 5ac79cfa8a874f2a5499bfeb1505ad11bc00a6f5 (commit) from 5468a31e1dbf26ea2df09eeb786d75f8dfbd0a3c (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 ----------------------------------------------------------------- commit 5ac79cfa8a874f2a5499bfeb1505ad11bc00a6f5 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Thu Apr 19 23:22:01 2012 +0200 Fix SSHException usage. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + x2go/backends/control/_stdout.py | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 5e5810b..459982c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -115,6 +115,7 @@ python-x2go (0.1.2.0-0~x2go1) UNRELEASED; urgency=low - Do not call HOOK method if self.allow_share_local_folders is False. - Try to derive language information from X2goClient instance. - Make timeout on command execution customizable. + - Fix SSHException usage. * Depend on python-xlib. -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Sat, 28 Sep 2012 01:44:21 +0100 diff --git a/x2go/backends/control/_stdout.py b/x2go/backends/control/_stdout.py index baf0de3..c727345 100644 --- a/x2go/backends/control/_stdout.py +++ b/x2go/backends/control/_stdout.py @@ -173,7 +173,7 @@ class X2goControlSessionSTDOUT(paramiko.SSHClient): self.logger('sFTP-put: %s -> %s:%s' % (os.path.normpath(local_path), self.get_transport().getpeername(), remote_path), loglevel=log.loglevel_DEBUG) try: self.sftp_client.put(os.path.normpath(local_path), remote_path) - except SSHException: + except x2go_exceptions.SSHException: # react to connection dropped error for SSH connections raise x2go_exceptions.X2goControlSessionException('The SSH connection was dropped during an SFTP put action.') 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).