The branch, master has been updated via 89132a0b3d9756ec059e08c2077e1e63f1e2b35b (commit) from 8015f61d9854d63eb29bc5a3eb1eae4e9aa99768 (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 89132a0b3d9756ec059e08c2077e1e63f1e2b35b Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Mon Oct 3 17:08:06 2011 +0200 Catch SSHExceptions during interactive authentication. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + pyhoca/wxgui/logon.py | 9 ++++++++- 2 files changed, 9 insertions(+), 1 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 2241611..190b92e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -16,6 +16,7 @@ pyhoca-gui (0.1.0.9-0~x2go1) UNRELEASED; urgency=low - Spanish i18n update. - Dutch i18n update. - Update of README.i18n. + - Catch SSHExceptions during interactive authentication. * Depend on python-x2go (>=0.1.1.8). -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Wed, 14 Sep 2011 21:49:08 +0200 diff --git a/pyhoca/wxgui/logon.py b/pyhoca/wxgui/logon.py index 62cf27b..74af118 100644 --- a/pyhoca/wxgui/logon.py +++ b/pyhoca/wxgui/logon.py @@ -367,7 +367,6 @@ class PyHocaGUI_DialogBoxPassword(wx.Dialog): connect_failed = True except x2go.X2goSessionException, e: - 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), @@ -375,6 +374,14 @@ class PyHocaGUI_DialogBoxPassword(wx.Dialog): timeout=4000) connect_failed = True + except x2go.SSHException, e: + self._PyHocaGUI.notifier.prepare('AUTH_%s' % self.current_profile_name, + title=_(u'%s - connect error') % self.current_profile_name, + text='%s!' % str(e), + icon='auth_error', + timeout=4000) + connect_failed = True + except: self._PyHocaGUI.notifier.prepare('AUTH_%s' % self.current_profile_name, title=_(u'%s - connect error') % self.current_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)).