[X2Go-Commits] pyhoca-gui.git - twofactorauth (branch) updated: 0.0.34.0-5-ge83a702

[X2Go dev team]

The branch, twofactorauth has been updated
       via  e83a702b9f630cfe576de0c501af09676e9653f0 (commit)
      from  6d00ed8b14305aa100d79e38e5cee738bfe16bc7 (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 |    5 ++++-
 pyhoca/wxgui/logon.py    |    4 +++-
 2 files changed, 7 insertions(+), 2 deletions(-)

The diff of changes is:
diff --git a/pyhoca/wxgui/frontend.py b/pyhoca/wxgui/frontend.py
index 7e7af1c..2a7ab24 100644
--- a/pyhoca/wxgui/frontend.py
+++ b/pyhoca/wxgui/frontend.py
@@ -376,10 +376,13 @@ class PyHocaGUI(wx.App, x2go.X2goClient):
             self.notifier.send(_(u'%s - auth key error') % profile_name, '%s!' % str(e), icon='auth_error', timeout=4000)
             self._temp_disabled_profile_names.remove(profile_name)
             connect_failed = True
-        except:
+        except e:
             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)
             connect_failed = True
+            if os.environ.has_key('PYHOCAGUI_DEVELOPMENT') and os.environ['PYHOCAGUI_DEVELOPMENT'] == '1':
+                raise e
+
 
         if connect_failed and self.exit_on_disconnect:
             self.WakeUpIdle()
diff --git a/pyhoca/wxgui/logon.py b/pyhoca/wxgui/logon.py
index 07a9f11..0ec0979 100644
--- a/pyhoca/wxgui/logon.py
+++ b/pyhoca/wxgui/logon.py
@@ -324,12 +324,14 @@ class PyHocaGUI_DialogBoxPassword(wx.Frame):
             self._PyHocaGUI.notifier.prepare(_(u'%s - key error') % profile_name, '%s!' % str(e), icon='auth_error', timeout=4000)
             connect_failed = True
 
-        except:
+        except e:
             self._PyHocaGUI.notifier.prepare('AUTH_%s' % self.current_profile_name, 
                                              title=_(u'%s - connect error') % self.current_profile_name, 
                                              text=_(u'An unknown error occured during authentication!'),
                                              icon='auth_error')
             connect_failed = True
+            if os.environ.has_key('PYHOCAGUI_DEVELOPMENT') and os.environ['PYHOCAGUI_DEVELOPMENT'] == '1':
+                raise e
 
         self._PyHocaGUI.notifier.send(self.current_profile_name, context='AUTH_%s' % self.current_profile_name, timeout=4000)
         self.Close()


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)).