[X2go-Commits] python-x2go.git - master (branch) updated: 0.2.0.1-11-gccec42e

X2Go dev team git-admin at x2go.org
Fri Jun 8 00:26:43 CEST 2012


The branch, master has been updated
       via  ccec42eda30c802ce9d777a3711750fe1ace2e2f (commit)
      from  907069213701818b0530242e7d735f6ad88347c2 (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 -----------------------------------------------------------------
commit ccec42eda30c802ce9d777a3711750fe1ace2e2f
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Fri Jun 8 00:26:34 2012 +0200

    The master_sessions dict may never have None values.

-----------------------------------------------------------------------

Summary of changes:
 debian/changelog |    1 +
 x2go/registry.py |    3 ++-
 2 files changed, 3 insertions(+), 1 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 1f20cfb..a987596 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,7 @@ python-x2go (0.2.0.2-0~x2go1) UNRELEASED; urgency=low
     - Catch control session deaths when querying X2goSession.is_alive().
     - Do not create a high CPU load after a network failure, do not try to
       execute a remote command if the session has already died away.
+    - The master_sessions dict may never have None values.
 
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Wed, 30 May 2012 00:27:03 +0200
 
diff --git a/x2go/registry.py b/x2go/registry.py
index f9bf5ad..85ddf3f 100644
--- a/x2go/registry.py
+++ b/x2go/registry.py
@@ -1047,7 +1047,8 @@ class X2goSessionRegistry(object):
         _session = self.master_sessions[profile_name]
 
         if not _session.is_master_session():
-            self.master_sessions[profile_name] = None
+            del self.master_sessions[profile_name]
+            return None
 
         if return_object:
             return _session


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