[X2Go-Commits] pyhoca-gui.git - build-59a18b6e3b5d3f1dd8f07f26433d37fe5984a57d (branch) updated: 0.1.0.5-9-g9787549

[X2Go dev team]

The branch, build-59a18b6e3b5d3f1dd8f07f26433d37fe5984a57d has been updated
       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 -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 debian/changelog         |    1 +
 pyhoca/wxgui/frontend.py |    7 +++++++
 pyhoca/wxgui/logon.py    |    4 ++++
 3 files changed, 12 insertions(+)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 3b99600..917139a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ pyhoca-gui (0.1.0.6-0~x2go3) UNRELEASED; urgency=low
     - unicode fix for Windows notifications
     - i18n fixes
     - README/TODO update.
+    - Handle X2goSession failures (SFTP open) during authentication.
   * Properly depend on Python X2go package.
 
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Fri, 01 Jul 2011 14:04:42 +0200
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)).