x2go-commits

x2go-commits@lists.x2go.org

37909 discussions

python-x2go.git - master (branch) updated: 0.1.0.3-8-g27d7b87
by git-admin＠x2go.org 20 Jun '11

20 Jun '11

The branch, master has been updated via 27d7b87c686844af7b63b6045aff296a9b8da04d (commit) from 94a3a09921f8ece7076a485c127aafa55e42d2cd (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 27d7b87c686844af7b63b6045aff296a9b8da04d Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon Jun 20 11:44:49 2011 +0200 not closing SSH transport on authentication failures ----------------------------------------------------------------------- Summary of changes: x2go/backends/control/_stdout.py | 8 ++++++++ x2go/sshproxy.py | 2 -- 2 files changed, 8 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/x2go/backends/control/_stdout.py b/x2go/backends/control/_stdout.py index 38e3a6f..7e6245e 100644 --- a/x2go/backends/control/_stdout.py +++ b/x2go/backends/control/_stdout.py @@ -397,6 +397,10 @@ class X2goControlSessionSTDOUT(paramiko.SSHClient): paramiko.SSHClient.connect(self, hostname, port=port, username=username, password=password, timeout=timeout, allow_agent=allow_agent, look_for_keys=look_for_keys) + except paramiko.AuthenticationException, e: + if self.sshproxy_session: + self.sshproxy_session.stop_thread() + raise e except: if self.sshproxy_session: self.sshproxy_session.stop_thread() @@ -423,6 +427,10 @@ class X2goControlSessionSTDOUT(paramiko.SSHClient): try: paramiko.SSHClient.connect(self, hostname, port=port, username=username, password=password, timeout=timeout, allow_agent=allow_agent, look_for_keys=look_for_keys) + except paramiko.AuthenticationException, e: + if self.sshproxy_session: + self.sshproxy_session.stop_thread() + raise e except: if self.sshproxy_session: self.sshproxy_session.stop_thread() diff --git a/x2go/sshproxy.py b/x2go/sshproxy.py index 25da56f..670fe0c 100644 --- a/x2go/sshproxy.py +++ b/x2go/sshproxy.py @@ -173,7 +173,6 @@ class X2goSSHProxy(paramiko.SSHClient, threading.Thread): allow_agent=False, ) except AuthenticationException, e: - self.close() raise X2goSSHProxyAuthenticationException('pubkey auth mechanisms both failed') except: self.close() @@ -192,7 +191,6 @@ class X2goSSHProxy(paramiko.SSHClient, threading.Thread): allow_agent=False, ) except AuthenticationException: - self.close() raise X2goSSHProxyAuthenticationException('interactive auth mechanisms failed') except: self.close() hooks/post-receive -- python-x2go.git (Python X2go Client API) 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 "python-x2go.git" (Python X2go Client API).

1 0

pyhoca-gui.git - master (branch) updated: 0.1.0.2-7-gc8bb328
by git-admin＠x2go.org 20 Jun '11

20 Jun '11

The branch, master has been updated via c8bb328e8db95a7e9056f92909681c3ae62492bf (commit) from d215d5a8532a28e053607f2d587e949d685342a1 (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 c8bb328e8db95a7e9056f92909681c3ae62492bf Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon Jun 20 10:37:14 2011 +0200 more unicode fixes during authentication ----------------------------------------------------------------------- Summary of changes: pyhoca/wxgui/frontend.py | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) The diff of changes is: diff --git a/pyhoca/wxgui/frontend.py b/pyhoca/wxgui/frontend.py index 2d2f2b5..5405a8a 100644 --- a/pyhoca/wxgui/frontend.py +++ b/pyhoca/wxgui/frontend.py @@ -363,28 +363,28 @@ class PyHocaGUI(wx.App, x2go.X2goClient): pass connect_failed = True except x2go.X2goHostKeyException, e: - self.notifier.send(_(u'%s - host key error') % profile_name, u'%s!' % _(u'The remote server\'s host key is invalid or has not been accepted by the user'), icon='auth_error', timeout=4000) + self.notifier.send(_(u'%s - host key error') % profile_name, _(u'The remote server\'s host key is invalid or has not been accepted by the user') + '!', icon='auth_error', timeout=4000) try: self._temp_disabled_profile_names.remove(profile_name) except ValueError: pass connect_failed = True except x2go.X2goSSHProxyHostKeyException, e: - self.notifier.send(_(u'%s - host key error') % profile_name, u'%s!' % _(u'The SSH proxy\'s host key is invalid or has not been accepted by the user'), icon='auth_error', timeout=4000) + self.notifier.send(_(u'%s - host key error') % profile_name, _(u'The SSH proxy\'s host key is invalid or has not been accepted by the user') + '!', icon='auth_error', timeout=4000) try: self._temp_disabled_profile_names.remove(profile_name) except ValueError: pass connect_failed = True except gevent.dns.DNSError, e: - self.notifier.send(_(u'%s - connect error') % profile_name, u'%s!' % e.strerror, icon='auth_error', timeout=4000) + self.notifier.send(_(u'%s - connect 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, u'%s!' % e.strerror, icon='auth_error', timeout=4000) + self.notifier.send(_(u'%s - connect error') % profile_name, e.strerror, icon='auth_error', timeout=4000) try: self._temp_disabled_profile_names.remove(profile_name) except ValueError: @@ -398,7 +398,7 @@ class PyHocaGUI(wx.App, x2go.X2goClient): pass connect_failed = True except x2go.X2goSSHProxyException, e: - self.notifier.send(_(u'%s - auth key error') % profile_name, u'%s!' % str(e), icon='auth_error', timeout=4000) + self.notifier.send(_(u'%s - auth key error') % profile_name, u'%s' % str(e), icon='auth_error', timeout=4000) try: self._temp_disabled_profile_names.remove(profile_name) except ValueError: 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)).

1 0

python-x2go.git - master (branch) updated: 0.1.0.3-7-g94a3a09
by git-admin＠x2go.org 20 Jun '11

20 Jun '11

The branch, master has been updated via 94a3a09921f8ece7076a485c127aafa55e42d2cd (commit) from e0a1241c3982f8d637ccda7f2fe9c0f3a3ed21af (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 94a3a09921f8ece7076a485c127aafa55e42d2cd Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon Jun 20 10:13:16 2011 +0200 catch SSHException during x2go_exec_command ----------------------------------------------------------------------- Summary of changes: x2go/backends/control/_stdout.py | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) The diff of changes is: diff --git a/x2go/backends/control/_stdout.py b/x2go/backends/control/_stdout.py index a34a2bc..38e3a6f 100644 --- a/x2go/backends/control/_stdout.py +++ b/x2go/backends/control/_stdout.py @@ -198,6 +198,11 @@ class X2goControlSessionSTDOUT(paramiko.SSHClient): if self.sshproxy_session: self.sshproxy_session.stop_thread() raise x2go_exceptions.X2goControlSessionException('the X2go control session has died unexpectedly') + except x2go_exceptions.SSHException: + self.session_died = True + if self.sshproxy_session: + self.sshproxy_session.stop_thread() + raise x2go_exceptions.X2goControlSessionException('the X2go control session has died unexpectedly') except gevent.timeout.Timeout: self.session_died = True if self.sshproxy_session: hooks/post-receive -- python-x2go.git (Python X2go Client API) 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 "python-x2go.git" (Python X2go Client API).

1 0

pyhoca-gui.git - master (branch) updated: 0.1.0.2-6-gd215d5a
by git-admin＠x2go.org 19 Jun '11

19 Jun '11

The branch, master has been updated via d215d5a8532a28e053607f2d587e949d685342a1 (commit) from b4d8418982b78220c40ffd6e9231fd037d47a516 (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 d215d5a8532a28e053607f2d587e949d685342a1 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sun Jun 19 23:05:19 2011 +0200 import fix for x2go.utils ----------------------------------------------------------------------- Summary of changes: pyhoca/wxgui/notify.py | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) The diff of changes is: diff --git a/pyhoca/wxgui/notify.py b/pyhoca/wxgui/notify.py index 6b0308d..feafd85 100644 --- a/pyhoca/wxgui/notify.py +++ b/pyhoca/wxgui/notify.py @@ -27,6 +27,8 @@ if X2GOCLIENT_OS in ('Linux', 'Mac'): import exceptions import basepath +import x2go.utils as utils + _icons_location = basepath.icons_basepath class NotSupportedException(exceptions.StandardError): pass 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)).

1 0

pyhoca-gui.git - master (branch) updated: 0.1.0.2-5-gb4d8418
by git-admin＠x2go.org 19 Jun '11

19 Jun '11

The branch, master has been updated via b4d8418982b78220c40ffd6e9231fd037d47a516 (commit) from f77b4cb44d12122ad3d455b4baa106c285be5127 (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 b4d8418982b78220c40ffd6e9231fd037d47a516 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sun Jun 19 23:02:58 2011 +0200 trying another approach for unicode fix ----------------------------------------------------------------------- Summary of changes: pyhoca/wxgui/notify.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/pyhoca/wxgui/notify.py b/pyhoca/wxgui/notify.py index 3d2235d..6b0308d 100644 --- a/pyhoca/wxgui/notify.py +++ b/pyhoca/wxgui/notify.py @@ -85,7 +85,7 @@ class libnotify_NotifierPopup(object): n.set_urgency(pynotify.URGENCY_NORMAL) n.set_timeout(timeout) - self._pyhoca_logger('[%s] %s' % (title, text), loglevel=log.loglevel_NOTICE) + self._pyhoca_logger('[%s] %s' % (title.decode(utils.get_encoding()), text.decode(utils.get_encoding())), loglevel=log.loglevel_NOTICE) if not n.show(): raise PyHocaNotificationException('could not notify user') @@ -171,7 +171,7 @@ class notificationmessage_NotifierPopup(object): # wx.NotificationMessage class pass - self._pyhoca_logger('[%s] %s' % (title, text), loglevel=log.loglevel_NOTICE) + self._pyhoca_logger('[%s] %s' % (title.decode(utils.get_encoding()), text.decode(utils.get_encoding())), loglevel=log.loglevel_NOTICE) def Close(self): pass 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)).

1 0

pyhoca-gui.git - master (branch) updated: 0.1.0.2-4-gf77b4cb
by git-admin＠x2go.org 19 Jun '11

19 Jun '11

The branch, master has been updated via f77b4cb44d12122ad3d455b4baa106c285be5127 (commit) from b344d95c5629d51f7ec31cfed76e071782afe8f7 (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 f77b4cb44d12122ad3d455b4baa106c285be5127 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sun Jun 19 22:25:17 2011 +0200 another unicode fix ----------------------------------------------------------------------- Summary of changes: pyhoca/wxgui/logon.py | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) The diff of changes is: diff --git a/pyhoca/wxgui/logon.py b/pyhoca/wxgui/logon.py index 6dfb45c..2363d98 100644 --- a/pyhoca/wxgui/logon.py +++ b/pyhoca/wxgui/logon.py @@ -302,21 +302,21 @@ class PyHocaGUI_DialogBoxPassword(wx.Frame): except gevent.dns.DNSError, e: self._PyHocaGUI.notifier.prepare('AUTH_%s' % self.current_profile_name, title=_(u'%s - connect error') % self.current_profile_name, - text=u'%s!' % e.strerror.decode(), + 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, - text=u'%s!' % e.strerror.decode(), + text=e.strerror + '!', icon='auth_error') connect_failed = True except x2go.X2goHostKeyException, e: self._PyHocaGUI.notifier.prepare('AUTH_%s' % self.current_profile_name, title=_(u'%s - host key error') % self.current_profile_name, - text=u'%s!' % _(u'The remote server\'s host key is invalid or has not been accepted by the user'), + text=_(u'The remote server\'s host key is invalid or has not been accepted by the user') + '!', icon='auth_error', timeout=4000) 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)).

1 0

pyhoca-gui.git - master (branch) updated: 0.1.0.2-3-gb344d95
by git-admin＠x2go.org 19 Jun '11

19 Jun '11

The branch, master has been updated via b344d95c5629d51f7ec31cfed76e071782afe8f7 (commit) from 9575809204dd7d58d174ce9c3d286fe55b5fe004 (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 b344d95c5629d51f7ec31cfed76e071782afe8f7 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sun Jun 19 22:21:10 2011 +0200 another unicode fix ----------------------------------------------------------------------- Summary of changes: pyhoca/wxgui/logon.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/pyhoca/wxgui/logon.py b/pyhoca/wxgui/logon.py index cb93311..6dfb45c 100644 --- a/pyhoca/wxgui/logon.py +++ b/pyhoca/wxgui/logon.py @@ -302,14 +302,14 @@ class PyHocaGUI_DialogBoxPassword(wx.Frame): except gevent.dns.DNSError, e: self._PyHocaGUI.notifier.prepare('AUTH_%s' % self.current_profile_name, title=_(u'%s - connect error') % self.current_profile_name, - text=u'%s!' % decode(e.strerror), + text=u'%s!' % e.strerror.decode(), 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, - text=u'%s!' % decode(e.strerror), + text=u'%s!' % e.strerror.decode(), 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)).

1 0

pyhoca-gui.git - master (branch) updated: 0.1.0.2-2-g9575809
by git-admin＠x2go.org 19 Jun '11

19 Jun '11

The branch, master has been updated via 9575809204dd7d58d174ce9c3d286fe55b5fe004 (commit) from c8f2ebd5b8455a4ca953cd368bd515b6bcb9ac95 (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 9575809204dd7d58d174ce9c3d286fe55b5fe004 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sun Jun 19 22:19:06 2011 +0200 another unicode fix ----------------------------------------------------------------------- Summary of changes: pyhoca/wxgui/logon.py | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) The diff of changes is: diff --git a/pyhoca/wxgui/logon.py b/pyhoca/wxgui/logon.py index 81672f1..cb93311 100644 --- a/pyhoca/wxgui/logon.py +++ b/pyhoca/wxgui/logon.py @@ -302,14 +302,14 @@ class PyHocaGUI_DialogBoxPassword(wx.Frame): except gevent.dns.DNSError, e: self._PyHocaGUI.notifier.prepare('AUTH_%s' % self.current_profile_name, title=_(u'%s - connect error') % self.current_profile_name, - text=u'%s!' % e.strerror, + text=u'%s!' % decode(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, - text=u'%s!' % e.strerror, + text=u'%s!' % decode(e.strerror), icon='auth_error') connect_failed = True @@ -322,7 +322,7 @@ class PyHocaGUI_DialogBoxPassword(wx.Frame): connect_failed = True except x2go.X2goSSHProxyException, e: - self._PyHocaGUI.notifier.prepare(_(u'%s - key error') % profile_name, '%s!' % str(e), icon='auth_error', timeout=4000) + self._PyHocaGUI.notifier.prepare(_(u'%s - key error') % profile_name, '%s!' % decode(str(e)), icon='auth_error', timeout=4000) connect_failed = True except: 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)).

1 0

pyhoca-gui.git - master (branch) updated: 0.1.0.2-1-gc8f2ebd
by git-admin＠x2go.org 19 Jun '11

19 Jun '11

The branch, master has been updated via c8f2ebd5b8455a4ca953cd368bd515b6bcb9ac95 (commit) from cf20bd0e4f17055d90aa7cf2c88c06f6344d95f2 (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 c8f2ebd5b8455a4ca953cd368bd515b6bcb9ac95 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sun Jun 19 22:15:20 2011 +0200 Fix utf-8 errors during authentication. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 6 ++++++ pyhoca/wxgui/frontend.py | 14 +++++++------- pyhoca/wxgui/logon.py | 6 +++--- 3 files changed, 16 insertions(+), 10 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 132c17a..ca28f35 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +pyhoca-gui (0.1.0.3-0~x2go1) UNRELEASED; urgency=low + + * Fix utf-8 errors during authentication. + + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Sun, 19 Jun 2011 22:14:22 +0200 + pyhoca-gui (0.1.0.2-0~x2go1) unstable; urgency=low * New upstream release (0.1.0.2): diff --git a/pyhoca/wxgui/frontend.py b/pyhoca/wxgui/frontend.py index f33d494..2d2f2b5 100644 --- a/pyhoca/wxgui/frontend.py +++ b/pyhoca/wxgui/frontend.py @@ -356,35 +356,35 @@ 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, '%s!' % str(e), icon='auth_error', timeout=4000) + self.notifier.send(_(u'%s - connect 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 x2go.X2goHostKeyException, e: - self.notifier.send(_(u'%s - host key error') % profile_name, '%s!' % _(u'The remote server\'s host key is invalid or has not been accepted by the user'), icon='auth_error', timeout=4000) + self.notifier.send(_(u'%s - host key error') % profile_name, u'%s!' % _(u'The remote server\'s host key is invalid or has not been accepted by the user'), icon='auth_error', timeout=4000) try: self._temp_disabled_profile_names.remove(profile_name) except ValueError: pass connect_failed = True except x2go.X2goSSHProxyHostKeyException, e: - self.notifier.send(_(u'%s - host key error') % profile_name, '%s!' % _(u'The SSH proxy\'s host key is invalid or has not been accepted by the user'), icon='auth_error', timeout=4000) + self.notifier.send(_(u'%s - host key error') % profile_name, u'%s!' % _(u'The SSH proxy\'s host key is invalid or has not been accepted by the user'), icon='auth_error', timeout=4000) try: self._temp_disabled_profile_names.remove(profile_name) except ValueError: pass connect_failed = True except gevent.dns.DNSError, e: - self.notifier.send(_(u'%s - connect error') % profile_name, '%s!' % e.strerror, icon='auth_error', timeout=4000) + self.notifier.send(_(u'%s - connect error') % profile_name, u'%s!' % 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, '%s!' % e.strerror, icon='auth_error', timeout=4000) + self.notifier.send(_(u'%s - connect error') % profile_name, u'%s!' % e.strerror, icon='auth_error', timeout=4000) try: self._temp_disabled_profile_names.remove(profile_name) except ValueError: @@ -398,14 +398,14 @@ class PyHocaGUI(wx.App, x2go.X2goClient): pass connect_failed = True except x2go.X2goSSHProxyException, e: - self.notifier.send(_(u'%s - auth key error') % profile_name, '%s!' % str(e), icon='auth_error', timeout=4000) + self.notifier.send(_(u'%s - auth key 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, 'An unknown error occurred during authentication!', icon='auth_error', timeout=4000) + self.notifier.send('%s - connect 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 cd2dfb0..81672f1 100644 --- a/pyhoca/wxgui/logon.py +++ b/pyhoca/wxgui/logon.py @@ -302,21 +302,21 @@ class PyHocaGUI_DialogBoxPassword(wx.Frame): except gevent.dns.DNSError, e: self._PyHocaGUI.notifier.prepare('AUTH_%s' % self.current_profile_name, title=_(u'%s - connect error') % self.current_profile_name, - text='%s!' % e.strerror, + text=u'%s!' % 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, - text='%s!' % e.strerror, + text=u'%s!' % e.strerror, icon='auth_error') connect_failed = True except x2go.X2goHostKeyException, e: self._PyHocaGUI.notifier.prepare('AUTH_%s' % self.current_profile_name, title=_(u'%s - host key error') % self.current_profile_name, - text='%s!' % _(u'The remote server\'s host key is invalid or has not been accepted by the user'), + text=u'%s!' % _(u'The remote server\'s host key is invalid or has not been accepted by the user'), icon='auth_error', timeout=4000) 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)).

1 0

python-x2go.git - master (branch) updated: 0.1.0.3-6-ge0a1241
by git-admin＠x2go.org 19 Jun '11

19 Jun '11

The branch, master has been updated via e0a1241c3982f8d637ccda7f2fe9c0f3a3ed21af (commit) from 04ecca3b0c80a420af49df7cb06dd5cb24b52dc9 (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 e0a1241c3982f8d637ccda7f2fe9c0f3a3ed21af Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sun Jun 19 22:01:09 2011 +0200 another type fix ----------------------------------------------------------------------- Summary of changes: x2go/backends/control/_stdout.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) The diff of changes is: diff --git a/x2go/backends/control/_stdout.py b/x2go/backends/control/_stdout.py index ca9efb7..a34a2bc 100644 --- a/x2go/backends/control/_stdout.py +++ b/x2go/backends/control/_stdout.py @@ -417,7 +417,7 @@ class X2goControlSessionSTDOUT(paramiko.SSHClient): self.logger('performing SSH keyboard-interactive authentication with server', loglevel=log.loglevel_DEBUG) try: paramiko.SSHClient.connect(self, hostname, port=port, username=username, password=password, - timeout=float(timeout), allow_agent=allow_agent, look_for_keys=look_for_keys) + timeout=timeout, allow_agent=allow_agent, look_for_keys=look_for_keys) except: if self.sshproxy_session: self.sshproxy_session.stop_thread() hooks/post-receive -- python-x2go.git (Python X2go Client API) 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 "python-x2go.git" (Python X2go Client API).

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

x2go-commits