[X2go-Commits] python-x2go.git - master (branch) updated: 0.2.0.7-2-gb097b88

X2Go dev team git-admin at x2go.org
Mon Jul 23 21:14:22 CEST 2012


The branch, master has been updated
       via  b097b889a85392c44d78c8e47624c369db8c1ca4 (commit)
      from  3b530bffe8d2908683ffb785989f6b1c420d0587 (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 b097b889a85392c44d78c8e47624c369db8c1ca4
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Mon Jul 23 21:14:11 2012 +0200

    Catch IOError exceptions during SFTP client operations. Proper use of except statement for multiple exception catching.

-----------------------------------------------------------------------

Summary of changes:
 debian/changelog                 |    8 +++++---
 x2go/backends/control/_stdout.py |    6 +++---
 2 files changed, 8 insertions(+), 6 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 2687590..98f1d6c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,10 @@
-python-x2go (0.2.0.8-0~x2go1) UNRELEASED; urgency=low
+python-x2go (0.2.0.8-0~x2go2) UNRELEASED; urgency=low
 
-  * Continue development...
+  * New upstream version (0.2.0.8):
+    - Catch IOError exceptions during SFTP client operations.
+    - Proper use of except statement for multiple exception catching.
 
- -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Thu, 12 Jul 2012 21:28:36 +0200
+ -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Mon, 23 Jul 2012 21:13:03 +0200
 
 python-x2go (0.2.0.7-0~x2go1) unstable; urgency=low
 
diff --git a/x2go/backends/control/_stdout.py b/x2go/backends/control/_stdout.py
index 6dff16a..d0441ac 100644
--- a/x2go/backends/control/_stdout.py
+++ b/x2go/backends/control/_stdout.py
@@ -274,7 +274,7 @@ class X2goControlSessionSTDOUT(paramiko.SSHClient):
             self.sftp_client = paramiko.SFTPClient.from_transport(ssh_transport)
             try:
                 self.sftp_client.put(os.path.normpath(local_path), remote_path)
-            except x2go_exceptions.SSHException, socket.error:
+            except (x2go_exceptions.SSHException, socket.error, IOError):
                 # react to connection dropped error for SSH connections
                 self.session_died = True
                 self._transport_lock.release()
@@ -306,7 +306,7 @@ class X2goControlSessionSTDOUT(paramiko.SSHClient):
                 self.logger('sFTP-write: writing content: %s' % content, loglevel=log.loglevel_DEBUG_SFTPXFER)
                 remote_fileobj.write(content)
                 remote_fileobj.close()
-            except x2go_exceptions.SSHException, socket.error:
+            except (x2go_exceptions.SSHException, socket.error, IOError):
                 self.session_died = True
                 self._transport_lock.release()
                 self.logger('sFTP-write: opening remote file %s on host %s failed' % (remote_path, self.remote_peername()), loglevel=log.loglevel_WARN)
@@ -333,7 +333,7 @@ class X2goControlSessionSTDOUT(paramiko.SSHClient):
             self.sftp_client = paramiko.SFTPClient.from_transport(ssh_transport)
             try:
                 self.sftp_client.remove(remote_path)
-            except x2go_exceptions.SSHException, socket.error:
+            except (x2go_exceptions.SSHException, socket.error, IOError):
                 self.session_died = True
                 self._transport_lock.release()
                 self.logger('sFTP-write: removing remote file %s on host %s failed' % (remote_path, self.remote_peername()), loglevel=log.loglevel_WARN)


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