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

X2Go dev team git-admin at x2go.org
Fri Nov 2 23:17:57 CET 2012


The branch, master has been updated
       via  6a54d5625b423a01a52b5e5882203195e51cd794 (commit)
      from  76f5cc8bdb1b7a0dfe63a516df806d557320266a (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 6a54d5625b423a01a52b5e5882203195e51cd794
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Fri Nov 2 23:17:31 2012 +0100

    Make pub app session startup more robust.

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

Summary of changes:
 debian/changelog         |    1 +
 pyhoca/wxgui/frontend.py |    4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index da70aa1..f416779 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -35,6 +35,7 @@ pyhoca-gui (0.2.1.0-0~x2go1) UNRELEASED; urgency=low
       request forwarding in session profile manager.
     - Add SSH agent README.
     - Rename session type XFCE4 to XFCE (using an unversioned session type name).
+    - Make pub app session startup more robust.
   * /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 5f8821b..dcfe28a 100644
--- a/pyhoca/wxgui/frontend.py
+++ b/pyhoca/wxgui/frontend.py
@@ -498,6 +498,8 @@ class PyHocaGUI(wx.App, x2go.X2goClient):
 
             if profile_name not in self._temp_launching_pubapp_profiles:
                 self._temp_launching_pubapp_profiles.append(profile_name)
+            else:
+                return None
 
             pubapp_session_started = False
             pubapp_session_resumed = False
@@ -516,7 +518,7 @@ class PyHocaGUI(wx.App, x2go.X2goClient):
                 # be one)
                 if pubapp_sessions_running:
                     gevent.sleep(1)
-            session_list = self._X2goClient__list_sessions(session_uuid=session_uuid, profile_name=profile_name, refresh_cache=True)
+                session_list = self._X2goClient__list_sessions(session_uuid=session_uuid, profile_name=profile_name, refresh_cache=True)
 
             if session_list:
                 pubapp_sessions_suspended = [ _sn for _sn in session_list.keys() if session_list[_sn].is_suspended() and session_list[_sn].is_published_applications_provider() ]


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