[X2Go-Commits] python-x2go.git - twofactorauth (branch) updated: 0.0.39.0-96-gb942b22

X2Go dev team git-admin at x2go.org
Sat Sep 14 15:56:23 CEST 2013


The branch, twofactorauth has been updated
       via  b942b22a7c23a250245d2204f0e9f59ed3907d91 (commit)
      from  e527c1bf683bb3cbb0ca66c9d4e09ac92f52e85d (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:
 x2go/registry.py |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

The diff of changes is:
diff --git a/x2go/registry.py b/x2go/registry.py
index 1fcb148..2624358 100644
--- a/x2go/registry.py
+++ b/x2go/registry.py
@@ -180,7 +180,7 @@ class X2goSessionRegistry(object):
                 if len(self.virgin_sessions_of_profile_name(profile_name)) > 1:
                     del self.registry[_session_uuid]
 
-            elif _last_status['running'] == False and _current_status['running'] == True:
+            elif _last_status['connected'] == True and (_last_status['running'] == False and _current_status['running'] == True):
                 # session has started
                 if _last_status['connected']:
                     if self(_session_uuid).has_terminal_session():
@@ -201,11 +201,11 @@ class X2goSessionRegistry(object):
                     # from a suspended state
                     self.client_instance.HOOK_on_found_session_running_after_connect(session_uuid=_session_uuid, profile_name=_profile_name, session_name=_session_name)
 
-            elif _last_status['suspended'] == False and _current_status['suspended'] == True:
+            elif _last_status['connected'] == True and (_last_status['suspended'] == False and _current_status['suspended'] == True):
                 # session has been suspended
                 self(_session_uuid).session_cleanup()
                 self.client_instance.HOOK_on_session_has_been_suspended(session_uuid=_session_uuid, profile_name=_profile_name, session_name=_session_name)
-            elif _last_status['terminated'] == False and _current_status['terminated'] == True:
+            elif _last_status['connected'] == True and (_last_status['terminated'] == False and _current_status['terminated'] == True):
                 # session has terminated
                 self.client_instance.HOOK_on_session_has_terminated(session_uuid=_session_uuid, profile_name=_profile_name, session_name=_session_name)
                 self(_session_uuid).session_cleanup()


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