[X2Go-Commits] pyhoca-cli.git - master (branch) updated: 0.4.0.1-2-ge47ed0a

X2Go dev team git-admin at x2go.org
Wed Sep 4 00:52:58 CEST 2013


The branch, master has been updated
       via  e47ed0ad000be7208ead90ed02dd70a7f5195bf0 (commit)
      from  0cfcb3ed779c46c9569fd372fa15db354d7cbe52 (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 e47ed0ad000be7208ead90ed02dd70a7f5195bf0
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Wed Sep 4 00:50:38 2013 +0200

    Add support for unlocking encrypted SSH private key files.

-----------------------------------------------------------------------

Summary of changes:
 debian/changelog       |    3 ++-
 pyhoca/cli/frontend.py |    6 +++---
 2 files changed, 5 insertions(+), 4 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index eebff6e..4892907 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 at das-netzwerkteam.de>  Tue, 12 Feb 2013 20:44:54 +0100
 
diff --git a/pyhoca/cli/frontend.py b/pyhoca/cli/frontend.py
index 6c68891..1c296e9 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:


hooks/post-receive
-- 
pyhoca-cli.git (Python X2Go Client (command line client))

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-cli.git" (Python X2Go Client (command line client)).




More information about the x2go-commits mailing list