This is an automated email from the git hooks/post-receive script. x2go pushed a commit to annotated tag 0.5.0.1 in repository x2goclient. commit e47ed0ad000be7208ead90ed02dd70a7f5195bf0 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Wed Sep 4 00:50:38 2013 +0200 Add support for unlocking encrypted SSH private key files. --- debian/changelog | 3 ++- pyhoca/cli/frontend.py | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index eebff6e6..48929073 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ pyhoca-cli (0.4.0.2-0~x2go1) UNRELEASED; urgency=low - * Continue development... + * New upstream version (0.4.0.2): + - Add support for unlocking encrypted SSH private key files. -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Tue, 12 Feb 2013 20:44:54 +0100 diff --git a/pyhoca/cli/frontend.py b/pyhoca/cli/frontend.py index 6c68891b..1c296e90 100644 --- a/pyhoca/cli/frontend.py +++ b/pyhoca/cli/frontend.py @@ -407,13 +407,13 @@ class PyHocaCLI(x2go.X2GoClient): try: self._X2GoClient__connect_session(self.x2go_session_hash, username=_username, password=self.args.password, force_password_auth=force_password_auth) connected = True + except x2go.PasswordRequiredException, e: + self._pyhoca_logger('unlock SSH key file (%s)' % self.args.ssh_privkey, loglevel=x2go.loglevel_NOTICE, ) + self.args.password = getpass.getpass() except x2go.AuthenticationException, e: force_password_auth = True 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.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) except x2go.SSHException, e: -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git