[X2go-Commits] pyhoca-gui.git - master (branch) updated: 0.2.0.4-89-gec4e5f5

X2Go dev team git-admin at x2go.org
Fri Nov 16 21:00:48 CET 2012


The branch, master has been updated
       via  ec4e5f5ddf1e7a35bdb310d99db2947aa9eb2ae9 (commit)
      from  113a759d6a62ce7da966cb23eba9203dfd7341a9 (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 ec4e5f5ddf1e7a35bdb310d99db2947aa9eb2ae9
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Fri Nov 16 20:59:18 2012 +0100

    Use threading.Lock() to prevent from simultaneous calls of the _init_pubapp_sessions() method.

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

Summary of changes:
 debian/changelog         |    2 ++
 pyhoca/wxgui/frontend.py |   11 +++++------
 2 files changed, 7 insertions(+), 6 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 78c4adf..a17dd0c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -43,6 +43,8 @@ pyhoca-gui (0.2.1.0-0~x2go1) UNRELEASED; urgency=low
       buttons.
     - Disable SSH agent forwarding for Windows. Code in Python Paramiko is no
       executable on MS Windows, currently.
+    - Use threading.Lock() to prevent from simultaneous calls of the
+      _init_pubapp_sessions() method.
   * /debian/control:
     + Maintainer change in package: X2Go Developers
       <x2go-dev at lists.berlios.de>.
diff --git a/pyhoca/wxgui/frontend.py b/pyhoca/wxgui/frontend.py
index e5b9a95..d8c1e98 100644
--- a/pyhoca/wxgui/frontend.py
+++ b/pyhoca/wxgui/frontend.py
@@ -484,6 +484,9 @@ class PyHocaGUI(wx.App, x2go.X2goClient):
         if profile_name is None and session_uuid:
             profile_name = self._X2goClient__get_session_profile_name(session_uuid)
 
+        if not self._temp_launching_pubapp_profiles.has_key(profile_name):
+            self._temp_launching_pubapp_profiles[profile_name] = threading.Lock()
+
         if not self._X2goClient__client_connected_sessions_of_profile_name(profile_name):
             return None
 
@@ -496,10 +499,7 @@ class PyHocaGUI(wx.App, x2go.X2goClient):
             if len(self.client_pubapp_sessions_of_profile_name(profile_name=profile_name)):
                 return False
 
-            if profile_name not in self._temp_launching_pubapp_profiles:
-                self._temp_launching_pubapp_profiles.append(profile_name)
-            else:
-                return None
+            self._temp_launching_pubapp_profiles[profile_name].acquire()
 
             pubapp_session_started = False
             pubapp_session_resumed = False
@@ -553,8 +553,7 @@ class PyHocaGUI(wx.App, x2go.X2goClient):
                                                                    )
                 pubapp_session_started = pubapp_session.start()
 
-            if profile_name in self._temp_launching_pubapp_profiles:
-                self._temp_launching_pubapp_profiles.remove(profile_name)
+            self._temp_launching_pubapp_profiles.release()
 
             return pubapp_session_started | pubapp_session_resumed
 


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)).




More information about the x2go-commits mailing list