[X2Go-Commits] pyhoca-gui.git - build-59a18b6e3b5d3f1dd8f07f26433d37fe5984a57d (branch) updated: 0.1.0.10-221-g15dab5d
X2Go dev team
git-admin at x2go.org
Tue Aug 27 13:22:20 CEST 2013
The branch, build-59a18b6e3b5d3f1dd8f07f26433d37fe5984a57d has been updated
via 15dab5d01c3fdd027611126acd3205616bcdb815 (commit)
from bae5b829194d0c480c1bac2988da6613302db46e (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:
debian/changelog | 2 ++
pyhoca/wxgui/frontend.py | 6 +++++-
2 files changed, 7 insertions(+), 1 deletion(-)
The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 68135c4..eccdfac 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -114,6 +114,8 @@ pyhoca-gui (0.1.2.0-0~x2go1) UNRELEASED; urgency=low
- Fix initialization of published applications sessions.
- Catch AttributeError in case a published applications session has not yet
fully started.
+ - Catch and notify command startup failures for published applications
+ sessions.
* Depend on Python X2Go 0.1.2.0.
* Install GNOME icons via dh_links.
* Install X2Go icons with explicit install paths.
diff --git a/pyhoca/wxgui/frontend.py b/pyhoca/wxgui/frontend.py
index 76d30d5..db99d99 100644
--- a/pyhoca/wxgui/frontend.py
+++ b/pyhoca/wxgui/frontend.py
@@ -639,7 +639,10 @@ class PyHocaGUI(wx.App, x2go.X2goClient):
_exec = self._eventid_pubapp_execmap[profile_name][evt.GetId()]
_s = self.get_session_of_session_name(_session_name, return_object=True)
if _s is not None and _s.is_alive():
- _s._X2goSession__exec_published_application(exec_name=_exec)
+ try:
+ _s._X2goSession__exec_published_application(exec_name=_exec, timeout=40)
+ except x2go.x2go_exceptions.X2goControlSessionException, e:
+ self.notifier.send(_(u'%s - session warning') % profile_name, _(u'Execution of command ,,%s'' failed.') % _exec, icon='session_warning', timeout=10000)
except KeyError:
pass
@@ -946,6 +949,7 @@ class PyHocaGUI(wx.App, x2go.X2goClient):
self.WakeUpIdle()
self.ExitMainLoop()
+
def HOOK_session_startup_failed(self, profile_name='UNKNOWN'):
self.notifier.send(_(u'%s - session failure') % profile_name, _('The session startup failed.'), icon='session_error', timeout=10000)
if self.exit_on_disconnect:
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