[X2Go-Commits] pyhoca-gui.git - twofactorauth (branch) updated: 07062a05a1d32215a34fb7a3fef557780527a67a
X2Go dev team
git-admin at x2go.org
Sat Sep 14 15:54:40 CEST 2013
The branch, twofactorauth has been updated
via 07062a05a1d32215a34fb7a3fef557780527a67a (commit)
from f5a726c7a10c17954a440ce7a3db18b01585e858 (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:
pyhoca/wxgui/frontend.py | 3 +++
pyhoca/wxgui/logon.py | 4 ++++
2 files changed, 7 insertions(+)
The diff of changes is:
diff --git a/pyhoca/wxgui/frontend.py b/pyhoca/wxgui/frontend.py
index b5a5e3f..3183908 100644
--- a/pyhoca/wxgui/frontend.py
+++ b/pyhoca/wxgui/frontend.py
@@ -334,6 +334,9 @@ class PyHocaGUI(wx.App, x2go.X2goClient):
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._temp_disabled_profile_names.remove(profile_name)
+ except x2go.X2goSSHProxyException, e:
+ self.notifier.send(_(u'%s - key error') % profile_name, '%s!' % str(e), icon='auth_error', timeout=4000)
+ self._temp_disabled_profile_names.remove(profile_name)
except:
self.notifier.send('%s - connect error' % profile_name, 'An unknown error occurred during authentication!', icon='auth_error', timeout=4000)
self._temp_disabled_profile_names.remove(profile_name)
diff --git a/pyhoca/wxgui/logon.py b/pyhoca/wxgui/logon.py
index 09db73f..a42c238 100644
--- a/pyhoca/wxgui/logon.py
+++ b/pyhoca/wxgui/logon.py
@@ -286,6 +286,10 @@ class PyHocaGUI_DialogBoxPassword(wx.Dialog):
title=_(u'%s - connect error') % self.current_profile_name,
text='%s!' % e.strerror,
icon='auth_error')
+
+ except x2go.X2goSSHProxyException, e:
+ self._PyHocaGUI.notifier.prepare(_(u'%s - key error') % profile_name, '%s!' % str(e), icon='auth_error', timeout=4000)
+
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)).
More information about the x2go-commits
mailing list