[X2Go-Commits] [pyhoca-cli] 09/11: Set specific 'Passphrase: ' prompt (not 'Password: ') when we query for SSH key passphrases.

git-admin at x2go.org git-admin at x2go.org
Tue Sep 18 18:45:49 CEST 2018


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

x2go pushed a commit to branch master
in repository pyhoca-cli.

commit 75f53ca91bd6ce55448e8b6166862f1b48e37df1
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Tue Sep 18 16:39:29 2018 +0000

    Set specific 'Passphrase: ' prompt (not 'Password: ') when we query for SSH key passphrases.
---
 pyhoca/cli/frontend.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pyhoca/cli/frontend.py b/pyhoca/cli/frontend.py
index 7a85410..4d94bf5 100644
--- a/pyhoca/cli/frontend.py
+++ b/pyhoca/cli/frontend.py
@@ -533,7 +533,7 @@ class PyHocaCLI(x2go.X2GoClient):
                         if passphrase == '':
                             self._pyhoca_logger('empty SSH key passphrase (%s), try again...' % self.args.ssh_privkey, loglevel=x2go.loglevel_WARN, )
                         self._pyhoca_logger('unlock SSH key file (%s)' % self.args.ssh_privkey, loglevel=x2go.loglevel_NOTICE, )
-                        passphrase = getpass.getpass()
+                        passphrase = getpass.getpass('Passphrase: ')
                         passphrase_unlock_counter -= 1
                         # undo auth counter decrement
                         _auth_count += 1
@@ -594,7 +594,7 @@ class PyHocaCLI(x2go.X2GoClient):
                             if passphrase is not None and passphrase != '':
                                 self._pyhoca_logger('wrong SSH key passphrase (%s), try again...' % self.args.ssh_privkey, loglevel=x2go.loglevel_WARN, )
                             self._pyhoca_logger('unlock SSH key file (%s)' % self.args.ssh_privkey, loglevel=x2go.loglevel_NOTICE, )
-                            passphrase = getpass.getpass()
+                            passphrase = getpass.getpass('Passphrase: ')
                             passphrase_unlock_counter -= 1
                             # undo auth counter decrement
                             _auth_count += 1

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


More information about the x2go-commits mailing list