[X2Go-Commits] [x2goclient] 48/94: removal of debug code

[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 473bfaf262e0ac2ec94f13877bd0eb97efafa3a5
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Tue May 17 09:39:31 2011 +0200

    removal of debug code
---
 pyhoca/cli/frontend.py | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/pyhoca/cli/frontend.py b/pyhoca/cli/frontend.py
index bd7525d0..634d48ba 100644
--- a/pyhoca/cli/frontend.py
+++ b/pyhoca/cli/frontend.py
@@ -242,6 +242,7 @@ class PyHocaCLI(x2go.X2goClient):
         """
         connected = False
         force_password_auth = False
+        _username = self.args.username or self._X2goClient__get_session_username(self.x2go_session_hash)
         try:
 
             while not connected:
@@ -250,13 +251,11 @@ class PyHocaCLI(x2go.X2goClient):
                     connected = True
                 except x2go.AuthenticationException, e:
                     force_password_auth = True
-                    self._pyhoca_logger('interactive login for user %s' % self.args.username, loglevel=x2go.loglevel_NOTICE, )
+                    self._pyhoca_logger('interactive login for user »%s«' % _username, loglevel=x2go.loglevel_NOTICE, )
                     self.args.password = getpass.getpass()
-                    #if force_password_auth: raise(e)
                 except x2go.PasswordRequiredException, e:
-                    self._pyhoca_logger('interactive login for user %s' % self.args.username, loglevel=x2go.loglevel_NOTICE, )
+                    self._pyhoca_logger('interactive login for user »%s«' % _username, loglevel=x2go.loglevel_NOTICE, )
                     self.args.password = getpass.getpass()
-                    #if force_password_auth: raise(e)
                 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)
                 except x2go.SSHException, e:

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