[X2Go-Commits] [python-x2go] 01/01: Fix catching control session exceptions in X2GoSession class.
git-admin at x2go.org
git-admin at x2go.org
Tue Dec 2 22:48:14 CET 2014
This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to branch master
in repository python-x2go.
commit 03ecca6ad953b0b0513bb2cb1c80004c318ed960
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date: Tue Dec 2 22:48:10 2014 +0100
Fix catching control session exceptions in X2GoSession class.
---
debian/changelog | 2 +-
x2go/session.py | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 0ef91a6..ebd659a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,6 @@
python-x2go (0.5.0.3-0x2go1) UNRELEASED; urgency=medium
- * Continue development...
+ * Fix catching control session exceptions in X2GoSession class.
-- Mike Gabriel <mike.gabriel at das-netzwerkteam.de> Thu, 27 Nov 2014 13:15:44 +0100
diff --git a/x2go/session.py b/x2go/session.py
index b0e1d84..a8ff088 100644
--- a/x2go/session.py
+++ b/x2go/session.py
@@ -1996,7 +1996,7 @@ class X2GoSession(object):
if _new_session:
try:
self.has_terminal_session() and self.terminal_session.run_command(env=self.session_environment)
- except x2go_exceptions.X2GoControlSessionException:
+ except x2go_exceptions.X2GoControlSessionException, e:
self.logger('%s' % str(e), loglevel=log.loglevel_ERROR)
self.HOOK_on_control_session_death()
self._X2GoSession__disconnect()
@@ -2197,7 +2197,7 @@ class X2GoSession(object):
# session, run this pre-set command now...
try:
self.terminal_session.run_command(env=self.session_environment)
- except x2go_exceptions.X2GoControlSessionException:
+ except x2go_exceptions.X2GoControlSessionException, e:
self.logger('%s' % str(e), loglevel=log.loglevel_ERROR)
self.HOOK_on_control_session_death()
self._X2GoSession__disconnect()
--
Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/python-x2go.git
More information about the x2go-commits
mailing list