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 0a743f26efb88d90ab6d7f3219ac1060dc2ac4a8 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Tue May 17 10:17:14 2011 +0200 if SSH privkey is not valid, use interactive auth --- pyhoca/cli/frontend.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pyhoca/cli/frontend.py b/pyhoca/cli/frontend.py index 49dacf4b..52bfcccb 100644 --- a/pyhoca/cli/frontend.py +++ b/pyhoca/cli/frontend.py @@ -30,6 +30,9 @@ import getpass from types import * from gevent import socket +# for debugging +import pprint + # a list of available X2go print actions from x2go.defaults import X2GO_PRINT_ACTIONS @@ -262,11 +265,13 @@ class PyHocaCLI(x2go.X2goClient): 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: - self._runtime_error(str(e), exitcode=253) + if str(e) != 'not a valid DSA private key file': + self._runtime_error(str(e), exitcode=253) + force_password_auth = True # workaround for Python bug: http://bugs.python.org/issue11236 try: - if '\x03' in self.args.password: + if self.args.password is not None and '\x03' in self.args.password: raise KeyboardInterrupt() except KeyboardInterrupt: self._runtime_error('Authentication cancelled by user by hitting Ctrl-C at password prompt.', exitcode=-200) -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git