[X2Go-Commits] python-x2go.git - build-baikal (branch) updated: 0.2.0.1-3-g44542ee

[X2Go dev team]

The branch, build-baikal has been updated
       via  44542ee31e44307378364c316a0539341abd3a0d (commit)
      from  683be10d60d52c45a68f5dd4a852683533a5f3c9 (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 |    4 +++-
 x2go/session.py  |    5 ++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index fc90e52..ef52702 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 python-x2go (0.2.0.2-0~x2go1) UNRELEASED; urgency=low
 
-  * Continue development...
+  * Bugfix release (0.2.0.2):
+    - Be tolerant if we can not terminate a session after failure of the
+      forwarding tunnel.
 
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Wed, 30 May 2012 00:27:03 +0200
 
diff --git a/x2go/session.py b/x2go/session.py
index ae92272..b157e8e 100644
--- a/x2go/session.py
+++ b/x2go/session.py
@@ -386,7 +386,10 @@ class X2goSession(object):
             self.logger('HOOK_forwarding_tunnel_setup_failed: Forwarding tunnel request to [%s]:%s for session %s (%s) was denied by remote X2go/SSH server. Session startup failed.' % (chain_host, chain_port, self.session_name, self.profile_name), loglevel=log.loglevel_WARN)
 
         # get rid of the faulty session...
-        self.terminate()
+        try:
+            self.terminate()
+        except x2go_exceptions.X2goSessionException:
+            pass
 
     def HOOK_printing_not_available(self):
         """\


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