[X2Go-Commits] python-x2go.git - release/0.4.0.x (branch) updated: 0.2.1.0-6-g3622a7f
X2Go dev team
git-admin at x2go.org
Tue Jan 7 16:18:24 CET 2014
The branch, release/0.4.0.x has been updated
via 3622a7fdaa275265faded8dc826661f329286848 (commit)
from b82e7b9674904d0432c6f9fc19a95ec2bb852b51 (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 | 1 +
x2go/cache.py | 6 +++---
2 files changed, 4 insertions(+), 3 deletions(-)
The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 8bdb054..4e5ad3c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ python-x2go (0.2.1.1-0~x2go1) UNRELEASED; urgency=low
- Rewrite colour depth of 17bits to 16bits when invoking rdesktop.
Relevant for X2Go-proxied RDP sessions started with PyHoca-GUI under
Windows.
+ - Handle control sessions being None in session list cache.
-- Mike Gabriel <mike.gabriel at das-netzwerkteam.de> Thu, 13 Dec 2012 13:32:30 +0100
diff --git a/x2go/cache.py b/x2go/cache.py
index 7c73692..232cd0b 100644
--- a/x2go/cache.py
+++ b/x2go/cache.py
@@ -153,7 +153,7 @@ class X2goListSessionsCache(object):
if self.x2go_listsessions_cache[profile_name]['sessions']:
for session_name in self.x2go_listsessions_cache[profile_name]['sessions']:
self.x2go_listsessions_cache[profile_name]['mounts'].update(control_session.list_mounts(session_name))
- except x2go_exceptions.X2goControlSessionException, e:
+ except (x2go_exceptions.X2goControlSessionException, AttributeError), e:
if profile_name in self.x2go_listsessions_cache.keys():
del self.x2go_listsessions_cache[profile_name]
self.protected = False
@@ -174,7 +174,7 @@ class X2goListSessionsCache(object):
"""
try:
self.x2go_listsessions_cache[profile_name]['desktops'] = control_session.list_desktops()
- except x2go_exceptions.X2goControlSessionException, e:
+ except (x2go_exceptions.X2goControlSessionException, AttributeError), e:
if profile_name in self.x2go_listsessions_cache.keys():
del self.x2go_listsessions_cache[profile_name]
self.protected = False
@@ -194,7 +194,7 @@ class X2goListSessionsCache(object):
try:
if control_session is not None:
self.x2go_listsessions_cache[profile_name]['sessions'] = control_session.list_sessions()
- except x2go_exceptions.X2goControlSessionException, e:
+ except (x2go_exceptions.X2goControlSessionException, AttributeError), e:
if profile_name in self.x2go_listsessions_cache.keys():
del self.x2go_listsessions_cache[profile_name]
self.protected = False
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