[X2Go-Commits] python-x2go.git - build-baikal (branch) updated: 0.1.1.4-221-g5468a31

[X2Go dev team]

The branch, build-baikal has been updated
       via  5468a31e1dbf26ea2df09eeb786d75f8dfbd0a3c (commit)
      from  b772385096b6cd0c7fbd28791e8eed2550a15b1e (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:
 x2go/backends/control/_stdout.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

The diff of changes is:
diff --git a/x2go/backends/control/_stdout.py b/x2go/backends/control/_stdout.py
index 50a699b..baf0de3 100644
--- a/x2go/backends/control/_stdout.py
+++ b/x2go/backends/control/_stdout.py
@@ -230,7 +230,7 @@ class X2goControlSessionSTDOUT(paramiko.SSHClient):
                     self.sshproxy_session.stop_thread()
                 self.locked = False
                 raise x2go_exceptions.X2goControlSessionException('the X2Go control session has died unexpectedly')
-            except gevent.timer.Timeout:
+            except gevent.timeout.Timeout:
                 self.session_died = True
                 if self.sshproxy_session:
                     self.sshproxy_session.stop_thread()


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).