The branch, master has been updated via 986dd6c6e1e8072985974cb1ed88f103c7c8356a (commit) from 7d35d2d3f9e73217a9168b8bc202303812628c8b (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 986dd6c6e1e8072985974cb1ed88f103c7c8356a Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Wed Apr 11 00:22:13 2012 +0200 Be more precise on error causes during SSH authentication. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + pyhoca/wxgui/frontend.py | 10 +++++----- pyhoca/wxgui/logon.py | 8 ++++---- 3 files changed, 10 insertions(+), 9 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index acb6421..5fa27b9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -91,6 +91,7 @@ pyhoca-gui (0.1.2.0-0~x2go1) UNRELEASED; urgency=low - Stdout/stderr diversion when frozen with py2exe: stdout will overwrite the last log file, stderr will append to the very same file. - Allow TCP ports higher than 64000 for SSH and sound server connections. + - Be more precise on error causes during SSH authentication. * 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 f517635..28257da 100644 --- a/pyhoca/wxgui/frontend.py +++ b/pyhoca/wxgui/frontend.py @@ -492,7 +492,7 @@ class PyHocaGUI(wx.App, x2go.X2goClient): _logon_window = logon.PyHocaGUI_DialogBoxPassword(self, profile_name, caller=self, sshproxy_auth=True ) self._logon_windows[profile_name] = _logon_window except x2go.SSHException, e: - self.notifier.send(_(u'%s - connect error') % profile_name, u'%s!' % str(e), icon='auth_error', timeout=4000) + self.notifier.send(_(u'%s - SSH error') % profile_name, u'%s!' % str(e), icon='auth_error', timeout=4000) try: self._temp_disabled_profile_names.remove(profile_name) except ValueError: @@ -513,21 +513,21 @@ class PyHocaGUI(wx.App, x2go.X2goClient): pass connect_failed = True except gevent.dns.DNSError, e: - self.notifier.send(_(u'%s - connect error') % profile_name, e.strerror, icon='auth_error', timeout=4000) + self.notifier.send(_(u'%s - DNS error') % profile_name, e.strerror, icon='auth_error', timeout=4000) try: self._temp_disabled_profile_names.remove(profile_name) except ValueError: pass connect_failed = True except gevent.socket.error, e: - self.notifier.send(_(u'%s - connect error') % profile_name, e.strerror, icon='auth_error', timeout=4000) + self.notifier.send(_(u'%s - socket error') % profile_name, e.strerror, icon='auth_error', timeout=4000) try: self._temp_disabled_profile_names.remove(profile_name) except ValueError: pass connect_failed = True except EOFError, e: - self.notifier.send(_(u'%s - connect error') % profile_name, _(u'Authentication protocol communication incomplete! Try again...'), icon='auth_error', timeout=4000) + self.notifier.send(_(u'%s - EOF error') % profile_name, _(u'Authentication protocol communication incomplete! Try again...'), icon='auth_error', timeout=4000) try: self._temp_disabled_profile_names.remove(profile_name) except ValueError: @@ -555,7 +555,7 @@ class PyHocaGUI(wx.App, x2go.X2goClient): pass connect_failed = True except: - self.notifier.send('%s - connect error' % profile_name, _(u'An unknown error occurred during authentication!'), icon='auth_error', timeout=4000) + self.notifier.send('%s - unknown error' % profile_name, _(u'An unknown error occurred during authentication!'), icon='auth_error', timeout=4000) try: self._temp_disabled_profile_names.remove(profile_name) except ValueError: diff --git a/pyhoca/wxgui/logon.py b/pyhoca/wxgui/logon.py index ec8000f..5797c0c 100644 --- a/pyhoca/wxgui/logon.py +++ b/pyhoca/wxgui/logon.py @@ -332,14 +332,14 @@ class PyHocaGUI_DialogBoxPassword(wx.Dialog): except gevent.dns.DNSError, e: self._PyHocaGUI.notifier.prepare('AUTH_%s' % self.current_profile_name, - title=_(u'%s - connect error') % self.current_profile_name, + title=_(u'%s - DNS error') % self.current_profile_name, text=e.strerror + '!', icon='auth_error') connect_failed = True except gevent.socket.error, e: self._PyHocaGUI.notifier.prepare('AUTH_%s' % self.current_profile_name, - title=_(u'%s - connect error') % self.current_profile_name, + title=_(u'%s - socket error') % self.current_profile_name, text=e.strerror + '!', icon='auth_error') connect_failed = True @@ -378,7 +378,7 @@ class PyHocaGUI_DialogBoxPassword(wx.Dialog): except x2go.SSHException, e: self._PyHocaGUI.notifier.prepare('AUTH_%s' % self.current_profile_name, - title=_(u'%s - connect error') % self.current_profile_name, + title=_(u'%s - SSH error') % self.current_profile_name, text='%s!' % str(e), icon='auth_error', timeout=4000) @@ -386,7 +386,7 @@ class PyHocaGUI_DialogBoxPassword(wx.Dialog): except: self._PyHocaGUI.notifier.prepare('AUTH_%s' % self.current_profile_name, - title=_(u'%s - connect error') % self.current_profile_name, + title=_(u'%s - unknown error') % self.current_profile_name, text=_(u'An unknown error occured during authentication!'), icon='auth_error') connect_failed = True 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)).