The branch, master has been updated via 559b9c89255acd600c10f6f0a50456c0efe14109 (commit) from 4d14558d12ba6b319527dedf1fa36bb95945d6dc (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 559b9c89255acd600c10f6f0a50456c0efe14109 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Sat Nov 3 11:45:25 2012 +0100 Avoid false positive notifications about started-by-other sessions. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + x2go/registry.py | 7 ++++--- 2 files changed, 5 insertions(+), 3 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 4dd18b3..3d2e3aa 100644 --- a/debian/changelog +++ b/debian/changelog @@ -27,6 +27,7 @@ python-x2go (0.2.1.0-0~x2go1) UNRELEASED; urgency=low version (our monkey patches have been sent upstream, so we might not need the monkey patching for paramiko >= 1.8.0 anymore). - Rename session type XFCE4 to XFCE (using an unversioned name). + - Avoid false positive notifications about started-by-other sessions. * /debian/rules: + Allow package build on systems with missing dh_python2. * /debian/control: diff --git a/x2go/registry.py b/x2go/registry.py index 07571c4..e50290f 100644 --- a/x2go/registry.py +++ b/x2go/registry.py @@ -267,7 +267,8 @@ class X2goSessionRegistry(object): if not self(_session_uuid).update_status(session_list=session_list, force_update=force_update): # skip this run, as nothing has changed since the last time... - return False + continue + _last_status = copy.deepcopy(self(_session_uuid)._last_status) _current_status = copy.deepcopy(self(_session_uuid)._current_status) @@ -316,8 +317,8 @@ class X2goSessionRegistry(object): if _last_status['suspended']: # from a suspended state self.client_instance.HOOK_on_session_has_resumed_by_other(session_uuid=_session_uuid, profile_name=_profile_name, session_name=_session_name) - elif _last_status['virgin']: - # as a new session + elif _last_status['connected'] and _last_status['virgin']: + # as a new session, do not report directly after connect due to many false positives then... self.client_instance.HOOK_on_session_has_started_by_other(session_uuid=_session_uuid, profile_name=_profile_name, session_name=_session_name) elif _last_status['connected'] and (not _last_status['suspended'] and _current_status['suspended']) and not _current_status['faulty'] and _session_name: 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).