The branch, build-main has been updated via c423498ca168ad360bc049714e50b87ea816e11c (commit) via 9787549164d45b22698648de971dc4f8e613f43d (commit) from 5887f89da2b562aeb68b295078b2fb5d45c4db1f (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 c423498ca168ad360bc049714e50b87ea816e11c Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Wed Jul 6 22:14:09 2011 +0200 release 0.1.0.6 ----------------------------------------------------------------------- Summary of changes: debian/changelog | 6 ++++-- debian/control | 2 +- pyhoca/wxgui/frontend.py | 7 +++++++ pyhoca/wxgui/logon.py | 4 ++++ 4 files changed, 16 insertions(+), 3 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 3b99600..72c720c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,13 +1,15 @@ -pyhoca-gui (0.1.0.6-0~x2go3) UNRELEASED; urgency=low +pyhoca-gui (0.1.0.6-0~x2go1) unstable; urgency=low * New upstream version (0.1.0.6): - bugfix release. - unicode fix for Windows notifications - i18n fixes - README/TODO update. + - Handle X2goSession failures (SFTP open) during authentication. * Properly depend on Python X2go package. + * Depend on Python X2go 0.1.1.3. - -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Fri, 01 Jul 2011 14:04:42 +0200 + -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Wed, 06 Jul 2011 22:13:14 +0200 pyhoca-gui (0.1.0.5-0~x2go1) unstable; urgency=low diff --git a/debian/control b/debian/control index e8a5e8b..ae979f0 100644 --- a/debian/control +++ b/debian/control @@ -27,7 +27,7 @@ Architecture: all Depends: ${misc:Depends}, python, - python-x2go (>=0.1.1.2-0~), + python-x2go (>=0.1.1.3-0~), python-argparse, python-notify, python-setproctitle, diff --git a/pyhoca/wxgui/frontend.py b/pyhoca/wxgui/frontend.py index a5cd682..d83fe16 100644 --- a/pyhoca/wxgui/frontend.py +++ b/pyhoca/wxgui/frontend.py @@ -423,6 +423,13 @@ class PyHocaGUI(wx.App, x2go.X2goClient): 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) + except ValueError: + 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) try: diff --git a/pyhoca/wxgui/logon.py b/pyhoca/wxgui/logon.py index b009805..ac82ea9 100644 --- a/pyhoca/wxgui/logon.py +++ b/pyhoca/wxgui/logon.py @@ -354,6 +354,10 @@ class PyHocaGUI_DialogBoxPassword(wx.Dialog): self._PyHocaGUI.notifier.prepare(_(u'%s - key error') % profile_name, '%s!' % decode(str(e)), icon='auth_error', timeout=4000) connect_failed = True + except x2go.X2goSessionException, e: + self._PyHocaGUI.notifier.prepare(_(u'%s - auth error') % profile_name, '%s!' % decode(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)).