python-x2go.git - build-main (branch) updated: 0.2.0.8 - x2go-commits

23 Jul 2012

The branch, build-main has been updated
       via  e5ddf494c09ea78a4dbfaf83007406089e1a781c (commit)
       via  b097b889a85392c44d78c8e47624c369db8c1ca4 (commit)
       via  3b530bffe8d2908683ffb785989f6b1c420d0587 (commit)
      from  1b376af2f94fca115ef3f8239394416940731620 (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:
 debian/changelog                 |    8 ++++++++
 x2go/__init__.py                 |    2 +-
 x2go/backends/control/_stdout.py |    6 +++---
 3 files changed, 12 insertions(+), 4 deletions(-)

The diff of changes is:

diff --git a/debian/changelog b/debian/changelog
index 9a6a1d2..8c34fd5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+python-x2go (0.2.0.8-0~x2go2) unstable; urgency=low
+
+  * 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@das-netzwerkteam.de>  Mon, 23 Jul 2012 21:16:28 +0200
+
 python-x2go (0.2.0.7-0~x2go1) unstable; urgency=low
 
   * New upstream version (0.2.0.7):
diff --git a/x2go/__init__.py b/x2go/__init__.py
index 9b73a72..31712d8 100644
--- a/x2go/__init__.py
+++ b/x2go/__init__.py
@@ -178,7 +178,7 @@ Contact
 """
 
 __NAME__    = 'python-x2go'
-__VERSION__ = '0.2.0.7'
+__VERSION__ = '0.2.0.8'
 
 from gevent import monkey
 monkey.patch_all()
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).

    