[X2Go-Commits] python-x2go.git - release/0.4.0.x (branch) updated: 0.1.1.4-134-ga34ffe9
X2Go dev team
git-admin at x2go.org
Tue Jan 7 16:17:43 CET 2014
The branch, release/0.4.0.x has been updated
via a34ffe959408cda6b58dea6d428e58ddac73fc17 (commit)
from 25926087b3833772daa39cdcb15eeb1d0088abd0 (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 | 2 ++
2 files changed, 3 insertions(+)
The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 6905acc..7e942d1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -42,6 +42,7 @@ python-x2go (0.1.2.0-0~x2go1) UNRELEASED; urgency=low
- Add published applications support.
- Fix base64 encoded icon string.
- Fix master session recognition.
+ - Handle empty control session in the session list cache.
* Depend on python-xlib.
-- Mike Gabriel <mike.gabriel at das-netzwerkteam.de> Sat, 28 Sep 2012 01:44:21 +0100
diff --git a/x2go/cache.py b/x2go/cache.py
index b447b7c..b25d11a 100644
--- a/x2go/cache.py
+++ b/x2go/cache.py
@@ -178,6 +178,8 @@ class X2goListSessionsCache(object):
"""
try:
+ if control_session is not None:
+ raise x2go_exceptions.X2goControlSessionException
self.x2go_listsessions_cache[profile_name]['sessions'] = control_session.list_sessions()
except x2go_exceptions.X2goControlSessionException, e:
try:
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