[X2Go-Commits] [x2goclient] 49/94: fixes UTF-8 error, session profile usage + password auth now fixed

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to annotated tag 0.1.4.0
in repository x2goclient.

commit d471d3d9c2152fa83328b3ea751b512889f07963
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Tue May 17 09:43:08 2011 +0200

    fixes UTF-8 error, session profile usage + password auth now fixed
---
 pyhoca/cli/frontend.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pyhoca/cli/frontend.py b/pyhoca/cli/frontend.py
index 634d48ba..111874cd 100644
--- a/pyhoca/cli/frontend.py
+++ b/pyhoca/cli/frontend.py
@@ -216,7 +216,7 @@ class PyHocaCLI(x2go.X2goClient):
             # setup up the manually configured X2go session
             self.x2go_session_hash = self._X2goClient__register_session(args.server, port=int(self.args.remote_ssh_port), 
                                                            known_hosts=ssh_known_hosts_filename,
-                                                           username=self.args.username, 
+                                                           username=self.args.username,
                                                            password=self.args.password,
                                                            key_filename=self.args.ssh_privkey,
                                                            add_to_known_hosts=self.args.add_to_known_hosts,
@@ -247,14 +247,14 @@ class PyHocaCLI(x2go.X2goClient):
 
             while not connected:
                 try:
-                    self._X2goClient__connect_session(self.x2go_session_hash, force_password_auth=force_password_auth)
+                    self._X2goClient__connect_session(self.x2go_session_hash, username=_username, password=self.args.password, force_password_auth=force_password_auth)
                     connected = True
                 except x2go.AuthenticationException, e:
                     force_password_auth = True
-                    self._pyhoca_logger('interactive login for user »%s«' % _username, loglevel=x2go.loglevel_NOTICE, )
+                    self._pyhoca_logger('interactive login for user ,,%s\'\'' % _username, loglevel=x2go.loglevel_NOTICE, )
                     self.args.password = getpass.getpass()
                 except x2go.PasswordRequiredException, e:
-                    self._pyhoca_logger('interactive login for user »%s«' % _username, loglevel=x2go.loglevel_NOTICE, )
+                    self._pyhoca_logger('interactive login for user ,,%s\'\'' % _username, loglevel=x2go.loglevel_NOTICE, )
                     self.args.password = getpass.getpass()
                 except x2go.BadHostKeyException:
                     self._runtime_error('SSH host key verification for remote host [%s]:%s failed' % (self.args.server, self.args.remote_ssh_port), exitcode=-254)

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git