The branch, master has been updated via f17a8e03caf06dc0f4cb20d318d3d305b7fd97e2 (commit) from f5c94ccec939abd931ddddbc649b7ea1864e58af (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 f17a8e03caf06dc0f4cb20d318d3d305b7fd97e2 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Sat Sep 24 23:01:01 2011 +0200 Add error message in case logon fails due to a missing home directory on the remote X2go server. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 ++ pyhoca/wxgui/frontend.py | 9 ++++++++- pyhoca/wxgui/logon.py | 27 ++++++++++++++++++++++----- 3 files changed, 32 insertions(+), 6 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 352dda9..2de6c53 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,6 +11,8 @@ pyhoca-gui (0.1.0.9-0~x2go1) UNRELEASED; urgency=low folders. - Add submenu support for sharing non-auto-connected shared folders. - Only offer foldering sharing in menus if server provides it. + - Add error message in case logon fails due to a missing home directory on + the remote X2go server. * Depend on python-x2go (>=0.1.1.7). -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Wed, 14 Sep 2011 21:49:08 +0200 diff --git a/pyhoca/wxgui/frontend.py b/pyhoca/wxgui/frontend.py index e90bab8..56c3bca 100644 --- a/pyhoca/wxgui/frontend.py +++ b/pyhoca/wxgui/frontend.py @@ -431,7 +431,14 @@ class PyHocaGUI(wx.App, x2go.X2goClient): except ValueError: pass connect_failed = True - except x2go.X2goSessionException, e: + except x2go.X2goRemoteHomeException, e: + self._PyHocaGUI.notifier.send(_(u'%s - missing home directory') % self.current_profile_name, _("The remote user's home directory does not exist."), icon='auth_error', timeout=4000) + try: + self._temp_disabled_profile_names.remove(profile_name) + except ValueError: + pass + connect_failed = True + except x2go.X2goSessionException, e: self.notifier.send(_(u'%s - auth error') % profile_name, u'%s' % str(e), icon='auth_error', timeout=4000) try: self._temp_disabled_profile_names.remove(profile_name) diff --git a/pyhoca/wxgui/logon.py b/pyhoca/wxgui/logon.py index ee8406a..62cf27b 100644 --- a/pyhoca/wxgui/logon.py +++ b/pyhoca/wxgui/logon.py @@ -280,9 +280,9 @@ class PyHocaGUI_DialogBoxPassword(wx.Dialog): self._PyHocaGUI.OnServerDisconnect(evt) else: self._PyHocaGUI.notifier.prepare('AUTH_%s' % self.current_profile_name, - title=_(u'%s - connect') % self.current_profile_name, - text=_(u'Authentication has been successful.'), - icon='auth_success') + title=_(u'%s - connect') % self.current_profile_name, + text=_(u'Authentication has been successful.'), + icon='auth_success') except x2go.AuthenticationException: if self.sshproxy_auth and (not self.sshproxy_started): @@ -350,12 +350,29 @@ class PyHocaGUI_DialogBoxPassword(wx.Dialog): timeout=4000) connect_failed = True + except x2go.X2goRemoteHomeException, e: + self._PyHocaGUI.notifier.prepare('AUTH_%s' % self.current_profile_name, + title=_(u'%s - missing home directory') % self.current_profile_name, + text=_("The remote user's home directory does not exist."), + icon='auth_error', + timeout=4000) + connect_failed = True + except x2go.X2goSSHProxyException, e: - self._PyHocaGUI.notifier.prepare(_(u'%s - key error') % self.current_profile_name, '%s!' % decode(str(e)), icon='auth_error', timeout=4000) + self._PyHocaGUI.notifier.prepare('AUTH_%s' % self.current_profile_name, + title=_(u'%s - key error') % self.current_profile_name, + text='%s!' % str(e), + icon='auth_error', + timeout=4000) connect_failed = True except x2go.X2goSessionException, e: - self._PyHocaGUI.notifier.prepare(_(u'%s - auth error') % self.current_profile_name, '%s!' % decode(str(e)), icon='auth_error', timeout=4000) + print str(e) + self._PyHocaGUI.notifier.prepare('AUTH_%s' % self.current_profile_name, + title=_(u'%s - auth error') % self.current_profile_name, + text='%s!' % str(e), + icon='auth_error', + timeout=4000) connect_failed = True except: 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)).