x2go-commits April 2012

x2go-commits@lists.x2go.org

1 participants
194 discussions

pyhoca-gui.git - master (branch) updated: 0.1.0.10-229-g1e6395a
by git-admin＠x2go.org 19 Apr '12

19 Apr '12

The branch, master has been updated via 1e6395a15de1e7ae13442aaaf627ca0dd0881076 (commit) from e8d4a46cf3d46d24f896d23feb4db6806e4b49fd (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 1e6395a15de1e7ae13442aaaf627ca0dd0881076 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri Apr 20 00:35:39 2012 +0200 For empty menu maps create a dummy menu. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + pyhoca/wxgui/menus_taskbar.py | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index ddd53cc..49125f9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -122,6 +122,7 @@ pyhoca-gui (0.1.2.0-0~x2go1) UNRELEASED; urgency=low - Only auto-resume if session profile is not configured for published applications. - Windows packaging: remove dist directory before calling py2exe. + - For empty menu maps create a dummy menu. * 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/menus_taskbar.py b/pyhoca/wxgui/menus_taskbar.py index 69a0a15..eefb3e9 100644 --- a/pyhoca/wxgui/menus_taskbar.py +++ b/pyhoca/wxgui/menus_taskbar.py @@ -379,7 +379,7 @@ def _generate_Menu_PublishedApplications(_PyHocaGUI, caller=None, profile_name=N except AttributeError: menu_map = None if not menu_map or not menu_map.has_key(_lang): - return {} + menu_map = { _lang: {} } if x2go.defaults.X2GOCLIENT_OS == 'Windows': _icon_size = "16x16" @@ -525,7 +525,8 @@ class PyHocaGUI_Menu_TaskbarSessionProfile(wx.Menu): _item = self.AppendItem(item=_menu_item) if _session_name_disabled: _item.Enable(False) - self.AppendSeparator() + if _category_map: + self.AppendSeparator() ID_RESUMESESSION = wx.NewId() ID_REFRESHMENU = wx.NewId() 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)).

1 0

pyhoca-gui.git - master (branch) updated: 0.1.0.10-228-ge8d4a46
by git-admin＠x2go.org 19 Apr '12

19 Apr '12

The branch, master has been updated via e8d4a46cf3d46d24f896d23feb4db6806e4b49fd (commit) from a9a9f371037d5eb78ef41f0f6394afbe64da38e7 (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 e8d4a46cf3d46d24f896d23feb4db6806e4b49fd Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri Apr 20 00:15:32 2012 +0200 Windows packaging: remove dist directory before calling py2exe. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + setup.py | 4 +++- 2 files changed, 4 insertions(+), 1 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index dc8ed36..ddd53cc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -121,6 +121,7 @@ pyhoca-gui (0.1.2.0-0~x2go1) UNRELEASED; urgency=low sessions. - Only auto-resume if session profile is not configured for published applications. + - Windows packaging: remove dist directory before calling py2exe. * Depend on Python X2Go 0.1.2.0. * Install GNOME icons via dh_links. * Install X2Go icons with explicit install paths. diff --git a/setup.py b/setup.py index b246bef..f1ae0d8 100755 --- a/setup.py +++ b/setup.py @@ -48,6 +48,7 @@ elif platform.system() == 'Linux': py2exe = object from glob import glob +import shutil from nsis_template import NSIS_SCRIPT_TEMPLATE @@ -112,10 +113,11 @@ class build_installer(py2exe): def run(self): + shutil.rmtree(self.dist_dir, ignore_errors=True) + # First, let py2exe do it's work. py2exe.run(self) - lib_dir = self.lib_dir dist_dir = self.dist_dir 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)).

1 0

pyhoca-gui.git - master (branch) updated: 0.1.0.10-227-ga9a9f37
by git-admin＠x2go.org 19 Apr '12

19 Apr '12

The branch, master has been updated via a9a9f371037d5eb78ef41f0f6394afbe64da38e7 (commit) from 4994d76bbd1b84ea4c75e61254b5337211b7502b (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 a9a9f371037d5eb78ef41f0f6394afbe64da38e7 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Apr 19 23:45:21 2012 +0200 Only auto-resume if session profile is not configured for published applications. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 ++ pyhoca/wxgui/frontend.py | 13 +++++++------ 2 files changed, 9 insertions(+), 6 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 097cbd3..dc8ed36 100644 --- a/debian/changelog +++ b/debian/changelog @@ -119,6 +119,8 @@ pyhoca-gui (0.1.2.0-0~x2go1) UNRELEASED; urgency=low - Do not suspend session if profile is disconnected. - Non-interactive application runs only disconnect/exit for associated sessions. + - Only auto-resume if session profile is not configured for published + applications. * 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 8d9798d..4ef68a4 100644 --- a/pyhoca/wxgui/frontend.py +++ b/pyhoca/wxgui/frontend.py @@ -318,12 +318,13 @@ class PyHocaGUI(wx.App, x2go.X2goClient): def session_auto_start_or_resume(self, session_uuid, newest=True, oldest=False, all_suspended=False): - if self.resume_newest_on_connect: - self._X2goClient__session_auto_start_or_resume(session_uuid, newest=True, start=self.start_on_connect) - elif self.resume_oldest_on_connect: - self._X2goClient__session_auto_start_or_resume(session_uuid, newest=False, oldest=True, start=self.start_on_connect) - elif self.resume_all_on_connect: - self._X2goClient__session_auto_start_or_resume(session_uuid, newest=False, all_suspended=True, start=self.start_on_connect) + if not self.get_session(session_uuid).published_applications: + if self.resume_newest_on_connect: + self._X2goClient__session_auto_start_or_resume(session_uuid, newest=True, start=self.start_on_connect) + elif self.resume_oldest_on_connect: + self._X2goClient__session_auto_start_or_resume(session_uuid, newest=False, oldest=True, start=self.start_on_connect) + elif self.resume_all_on_connect: + self._X2goClient__session_auto_start_or_resume(session_uuid, newest=False, all_suspended=True, start=self.start_on_connect) def _exit_handler(self, *args): self.WakeUpIdle() 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)).

1 0

pyhoca-gui.git - master (branch) updated: 0.1.0.10-226-g4994d76
by git-admin＠x2go.org 19 Apr '12

19 Apr '12

The branch, master has been updated via 4994d76bbd1b84ea4c75e61254b5337211b7502b (commit) from 7ac6e6b5a74b322fdc86f756d150c209229fa54e (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 4994d76bbd1b84ea4c75e61254b5337211b7502b Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Apr 19 23:40:39 2012 +0200 another menu separator fix ----------------------------------------------------------------------- Summary of changes: pyhoca/wxgui/menus_taskbar.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) The diff of changes is: diff --git a/pyhoca/wxgui/menus_taskbar.py b/pyhoca/wxgui/menus_taskbar.py index 2b3d0ba..69a0a15 100644 --- a/pyhoca/wxgui/menus_taskbar.py +++ b/pyhoca/wxgui/menus_taskbar.py @@ -504,7 +504,7 @@ class PyHocaGUI_Menu_TaskbarSessionProfile(wx.Menu): if current_profile_config['command'] == '' and current_profile_config['published']: - if not self._PyHocaGUI.restricted_trayicon and not (self._PyHocaGUI.disconnect_on_suspend and self._PyHocaGUI.disconnect_on_terminate): + if (not self._PyHocaGUI.restricted_trayicon and not (self._PyHocaGUI.disconnect_on_suspend and self._PyHocaGUI.disconnect_on_terminate)) or (profile_name in self._PyHocaGUI._temp_launching_pubapp_profiles): self.AppendSeparator() _pubapp_sessions = [ _pas for _pas in self._PyHocaGUI.client_pubapp_sessions_of_profile_name(profile_name, return_objects=True) if _pas.is_running() ] if _pubapp_sessions: 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)).

1 0

pyhoca-gui.git - master (branch) updated: 0.1.0.10-225-g7ac6e6b
by git-admin＠x2go.org 19 Apr '12

19 Apr '12

The branch, master has been updated via 7ac6e6b5a74b322fdc86f756d150c209229fa54e (commit) from 52be973e29bdfe65187916dbec10dd9739e8373b (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 7ac6e6b5a74b322fdc86f756d150c209229fa54e Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Apr 19 23:35:28 2012 +0200 more menu separator fixing ----------------------------------------------------------------------- Summary of changes: pyhoca/wxgui/menus_taskbar.py | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/pyhoca/wxgui/menus_taskbar.py b/pyhoca/wxgui/menus_taskbar.py index ce9c520..2b3d0ba 100644 --- a/pyhoca/wxgui/menus_taskbar.py +++ b/pyhoca/wxgui/menus_taskbar.py @@ -565,8 +565,6 @@ class PyHocaGUI_Menu_TaskbarSessionProfile(wx.Menu): if _session_name_disabled: _terminate_item.Enable(False) - self.AppendSeparator() - self._PyHocaGUI.Bind(wx.EVT_MENU, self._PyHocaGUI.OnSessionResume, id=ID_RESUMESESSION) self._PyHocaGUI.Bind(wx.EVT_MENU, self._PyHocaGUI.OnPubAppRefreshMenu, id=ID_REFRESHMENU) self._PyHocaGUI.Bind(wx.EVT_MENU, self._PyHocaGUI.OnSessionSuspend, id=ID_SUSPENDSESSION) 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)).

1 0

pyhoca-gui.git - master (branch) updated: 0.1.0.10-224-g52be973
by git-admin＠x2go.org 19 Apr '12

19 Apr '12

The branch, master has been updated via 52be973e29bdfe65187916dbec10dd9739e8373b (commit) from 9da6af7cadedd6dcc7724ee0ba3ce8d05651df1f (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 52be973e29bdfe65187916dbec10dd9739e8373b Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Apr 19 23:31:07 2012 +0200 fix menu separator ----------------------------------------------------------------------- Summary of changes: pyhoca/wxgui/menus_taskbar.py | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-) The diff of changes is: diff --git a/pyhoca/wxgui/menus_taskbar.py b/pyhoca/wxgui/menus_taskbar.py index 72bdc7b..ce9c520 100644 --- a/pyhoca/wxgui/menus_taskbar.py +++ b/pyhoca/wxgui/menus_taskbar.py @@ -684,14 +684,10 @@ class PyHocaGUI_Menu_TaskbarSessionProfile(wx.Menu): if _session_list_names: self.Append(id=ID_CLEANSESSIONS, text=_(u"&Clean all sessions")) self._PyHocaGUI.Bind(wx.EVT_MENU, self._PyHocaGUI.OnCleanSessions, id=ID_CLEANSESSIONS) - self.AppendSeparator() - - else: - - self.AppendSeparator() if not self._PyHocaGUI.restricted_trayicon: + self.AppendSeparator() self.Append(id=ID_EDITPROFILEWHILECONNECTED, text=_(u"Customize &profile")) self._PyHocaGUI.Bind(wx.EVT_MENU, self._PyHocaGUI.OnProfileEditWhileConnected, id=ID_EDITPROFILEWHILECONNECTED) @@ -701,6 +697,9 @@ class PyHocaGUI_Menu_TaskbarSessionProfile(wx.Menu): if current_profile_config['useexports'] and self._PyHocaGUI._X2goClient__profile_is_folder_sharing_available(profile_name=profile_name): + if self._PyHocaGUI.restricted_trayicon: + self.AppendSeparator() + _shared_folders = self.AppendMenu(id=ID_SHARELOCALFOLDER, text=_(u"Shared &folders"), submenu=PyHocaGUI_Menu_TaskbarProfileSharedFolders(self._PyHocaGUI, caller=self, profile_name=profile_name) 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)).

1 0

python-x2go.git - master (branch) updated: 0.1.1.4-222-g5ac79cf
by git-admin＠x2go.org 19 Apr '12

19 Apr '12

The branch, master has been updated via 5ac79cfa8a874f2a5499bfeb1505ad11bc00a6f5 (commit) from 5468a31e1dbf26ea2df09eeb786d75f8dfbd0a3c (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 5ac79cfa8a874f2a5499bfeb1505ad11bc00a6f5 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Apr 19 23:22:01 2012 +0200 Fix SSHException usage. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + x2go/backends/control/_stdout.py | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 5e5810b..459982c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -115,6 +115,7 @@ python-x2go (0.1.2.0-0~x2go1) UNRELEASED; urgency=low - Do not call HOOK method if self.allow_share_local_folders is False. - Try to derive language information from X2goClient instance. - Make timeout on command execution customizable. + - Fix SSHException usage. * Depend on python-xlib. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Sat, 28 Sep 2012 01:44:21 +0100 diff --git a/x2go/backends/control/_stdout.py b/x2go/backends/control/_stdout.py index baf0de3..c727345 100644 --- a/x2go/backends/control/_stdout.py +++ b/x2go/backends/control/_stdout.py @@ -173,7 +173,7 @@ class X2goControlSessionSTDOUT(paramiko.SSHClient): self.logger('sFTP-put: %s -> %s:%s' % (os.path.normpath(local_path), self.get_transport().getpeername(), remote_path), loglevel=log.loglevel_DEBUG) try: self.sftp_client.put(os.path.normpath(local_path), remote_path) - except SSHException: + except x2go_exceptions.SSHException: # react to connection dropped error for SSH connections raise x2go_exceptions.X2goControlSessionException('The SSH connection was dropped during an SFTP put action.') 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).

1 0

pyhoca-gui.git - master (branch) updated: 0.1.0.10-223-g9da6af7
by git-admin＠x2go.org 19 Apr '12

19 Apr '12

The branch, master has been updated via 9da6af7cadedd6dcc7724ee0ba3ce8d05651df1f (commit) via cd9ab4da648a31e5e86fbf79002ebd39d0c73bdd (commit) from 15dab5d01c3fdd027611126acd3205616bcdb815 (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 9da6af7cadedd6dcc7724ee0ba3ce8d05651df1f Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Apr 19 23:15:13 2012 +0200 Non-interactive application runs only disconnect/exit for associated sessions. commit cd9ab4da648a31e5e86fbf79002ebd39d0c73bdd Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Apr 19 23:10:39 2012 +0200 Do not suspend session if profile is disconnected. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 3 +++ pyhoca/wxgui/frontend.py | 7 ++++--- pyhoca/wxgui/menus_taskbar.py | 16 ++++++++-------- 3 files changed, 15 insertions(+), 11 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index eccdfac..097cbd3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -116,6 +116,9 @@ pyhoca-gui (0.1.2.0-0~x2go1) UNRELEASED; urgency=low fully started. - Catch and notify command startup failures for published applications sessions. + - Do not suspend session if profile is disconnected. + - Non-interactive application runs only disconnect/exit for associated + 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 db99d99..8d9798d 100644 --- a/pyhoca/wxgui/frontend.py +++ b/pyhoca/wxgui/frontend.py @@ -343,7 +343,8 @@ class PyHocaGUI(wx.App, x2go.X2goClient): if not self._hide_notifications_map.has_key(profile_name): self._hide_notifications_map[profile_name] = [] self._hide_notifications_map[profile_name].append(session_obj.get_session_name()) - session_obj.suspend() + try: session_obj.suspend() + except: pass x2go.x2go_cleanup() self.about.Close() self.taskbar.Close() @@ -691,7 +692,7 @@ class PyHocaGUI(wx.App, x2go.X2goClient): self._disable_session_name(profile_name, session_name) gevent.spawn(self._X2goClient__suspend_session, session_uuid, session_name=session_name) self._eventid_sessionnames_map = {} - if self.disconnect_on_suspend: + if self.disconnect_on_suspend and self.get_session(session_uuid).has_terminal_session(): self.OnServerDisconnect(evt) def OnSessionTerminate(self, evt): @@ -705,7 +706,7 @@ class PyHocaGUI(wx.App, x2go.X2goClient): self._disable_session_name(profile_name, session_name) gevent.spawn(self._X2goClient__terminate_session, session_uuid, session_name=session_name) self._eventid_sessionnames_map = {} - if self.disconnect_on_terminate: + if self.disconnect_on_terminate and self.get_session(session_uuid).has_terminal_session(): self.OnServerDisconnect(evt) def OnCleanSessions(self, evt): diff --git a/pyhoca/wxgui/menus_taskbar.py b/pyhoca/wxgui/menus_taskbar.py index f1669b8..72bdc7b 100644 --- a/pyhoca/wxgui/menus_taskbar.py +++ b/pyhoca/wxgui/menus_taskbar.py @@ -224,9 +224,9 @@ class PyHocaGUI_Menu_TaskbarSessionActions(wx.Menu): _ts = self.Append(text=_(u"Transfer Session (not possible)"), id=ID_TRANSFERSESSION_DISABLED) _ts.Enable(False) - if self._PyHocaGUI.disconnect_on_suspend and self._PyHocaGUI.exit_on_disconnect: + if self._PyHocaGUI.disconnect_on_suspend and self._PyHocaGUI.exit_on_disconnect and _s.has_terminal_session(): _ss = self.Append(text=_(u"Suspend Session (and disconnect/exit)"), id=ID_SUSPENDSESSION) - elif self._PyHocaGUI.disconnect_on_suspend: + elif self._PyHocaGUI.disconnect_on_suspend and _s.has_terminal_session(): _ss = self.Append(text=_(u"Suspend Session (and disconnect)"), id=ID_SUSPENDSESSION) else: _ss = self.Append(text=_(u"Suspend Session"), id=ID_SUSPENDSESSION) @@ -234,9 +234,9 @@ class PyHocaGUI_Menu_TaskbarSessionActions(wx.Menu): if _s.is_published_applications_provider() and not self._PyHocaGUI.get_profile_config(profile_name)['published']: _ss.Enable(False) - if self._PyHocaGUI.disconnect_on_terminate and self._PyHocaGUI.exit_on_disconnect: + if self._PyHocaGUI.disconnect_on_terminate and self._PyHocaGUI.exit_on_disconnect and _s.has_terminal_session(): self.Append(text=_(u"Terminate Session (and disconnect/exit)"), id=ID_SUSPENDSESSION) - elif self._PyHocaGUI.disconnect_on_terminate: + elif self._PyHocaGUI.disconnect_on_terminate and _s.has_terminal_session(): self.Append(text=_(u"Terminate Session (and disconnect)"), id=ID_TERMINATESESSION) else: self.Append(text=_(u"Terminate Session"), id=ID_TERMINATESESSION) @@ -543,9 +543,9 @@ class PyHocaGUI_Menu_TaskbarSessionProfile(wx.Menu): if _pubapp_session.is_running(): _refresh_menu_item = self.Append(text=_(u"Refresh menu tree"), id=ID_REFRESHMENU) self.AppendSeparator() - if self._PyHocaGUI.disconnect_on_suspend and self._PyHocaGUI.exit_on_disconnect: + if self._PyHocaGUI.disconnect_on_suspend and self._PyHocaGUI.exit_on_disconnect and _pubapp_session.has_terminal_session(): _suspend_item = self.Append(text=_(u"Suspend Session (and disconnect/exit)"), id=ID_SUSPENDSESSION) - elif self._PyHocaGUI.disconnect_on_suspend: + elif self._PyHocaGUI.disconnect_on_suspend and _pubapp_session.has_terminal_session(): _suspend_item = self.Append(text=_(u"Suspend Session (and disconnect)"), id=ID_SUSPENDSESSION) else: _suspend_item = self.Append(text=_(u"Suspend Session"), id=ID_SUSPENDSESSION) @@ -556,9 +556,9 @@ class PyHocaGUI_Menu_TaskbarSessionProfile(wx.Menu): _resume_item = self.Append(text=_(u"Resume Session"), id=ID_RESUMESESSION) if _session_name_disabled: _resume_item.Enable(False) - if self._PyHocaGUI.disconnect_on_terminate and self._PyHocaGUI.exit_on_disconnect: + if self._PyHocaGUI.disconnect_on_terminate and self._PyHocaGUI.exit_on_disconnect and _pubapp_session.has_terminal_session(): _terminate_item = self.Append(text=_(u"Terminate Session (and disconnect/exit)"), id=ID_TERMINATESESSION) - elif self._PyHocaGUI.disconnect_on_terminate: + elif self._PyHocaGUI.disconnect_on_terminate and _pubapp_session.has_terminal_session(): _terminate_item = self.Append(text=_(u"Terminate Session (and disconnect)"), id=ID_TERMINATESESSION) else: _terminate_item = self.Append(text=_(u"Terminate Session"), id=ID_TERMINATESESSION) 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)).

1 0

python-x2go.git - master (branch) updated: 0.1.1.4-221-g5468a31
by git-admin＠x2go.org 19 Apr '12

19 Apr '12

The branch, master has been updated via 5468a31e1dbf26ea2df09eeb786d75f8dfbd0a3c (commit) from b772385096b6cd0c7fbd28791e8eed2550a15b1e (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 5468a31e1dbf26ea2df09eeb786d75f8dfbd0a3c Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Apr 19 23:08:45 2012 +0200 fix typo ----------------------------------------------------------------------- Summary of changes: x2go/backends/control/_stdout.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) The diff of changes is: diff --git a/x2go/backends/control/_stdout.py b/x2go/backends/control/_stdout.py index 50a699b..baf0de3 100644 --- a/x2go/backends/control/_stdout.py +++ b/x2go/backends/control/_stdout.py @@ -230,7 +230,7 @@ class X2goControlSessionSTDOUT(paramiko.SSHClient): self.sshproxy_session.stop_thread() self.locked = False raise x2go_exceptions.X2goControlSessionException('the X2Go control session has died unexpectedly') - except gevent.timer.Timeout: + except gevent.timeout.Timeout: self.session_died = True if self.sshproxy_session: self.sshproxy_session.stop_thread() 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).

1 0

pyhoca-gui.git - master (branch) updated: 0.1.0.10-221-g15dab5d
by git-admin＠x2go.org 19 Apr '12

19 Apr '12

The branch, master 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 ----------------------------------------------------------------- commit 15dab5d01c3fdd027611126acd3205616bcdb815 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Apr 19 22:56:10 2012 +0200 Catch and notify command startup failures for published applications sessions. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 ++ pyhoca/wxgui/frontend.py | 6 +++++- 2 files changed, 7 insertions(+), 1 deletions(-) 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)).

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

x2go-commits April 2012