The branch, master has been updated via f90df6b606f0a644b930e9517a1155bda93c541c (commit) from e9478741990ca9cd8a4533f35503562954f82732 (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 f90df6b606f0a644b930e9517a1155bda93c541c Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Fri Apr 13 02:18:12 2012 +0200 handle race condition when initializing published application sessions ----------------------------------------------------------------------- Summary of changes: pyhoca/wxgui/frontend.py | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/pyhoca/wxgui/frontend.py b/pyhoca/wxgui/frontend.py index 92d14ad..19d3735 100644 --- a/pyhoca/wxgui/frontend.py +++ b/pyhoca/wxgui/frontend.py @@ -391,7 +391,7 @@ class PyHocaGUI(wx.App, x2go.X2goClient): ### PyHoca-GUI does not support more than one session in published applications mode... # suspend any running session that is in published applications mode (unless we are already associated with it) - session_list = self._X2goClient__list_sessions(session_uuid=session_uuid, profile_name=profile_name, refresh_cache=True, update_sessionregistry=True) + session_list = self._X2goClient__list_sessions(session_uuid=session_uuid, profile_name=profile_name) pubapp_sessions_running = [ _sn for _sn in session_list.keys() if session_list[_sn].is_running() and session_list[_sn].is_published_applications_provider() ] for session_name in pubapp_sessions_running: @@ -399,7 +399,9 @@ class PyHocaGUI(wx.App, x2go.X2goClient): # resume first available session in published applications mode... (from PyHoca-GUI's perspective there should only # be one) - session_list = self._X2goClient__list_sessions(session_uuid=session_uuid, profile_name=profile_name, refresh_cache=True, update_sessionregistry=True) + if pubapp_sessions_running: + gevent.sleep(1) + session_list = self._X2goClient__list_sessions(session_uuid=session_uuid, profile_name=profile_name, refresh_cache=True) pubapp_sessions_suspended = [ _sn for _sn in session_list.keys() if session_list[_sn].is_suspended() and session_list[_sn].is_published_applications_provider() ] for session_name in pubapp_sessions_suspended: hooks/post-receive -- pyhoca-gui.git (Python X2Go Client (wxPython GUI)) 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 "pyhoca-gui.git" (Python X2Go Client (wxPython GUI)).