This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository pyhoca-cli. commit 7303ada0a83b70863b1805452288919e8efdc235 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Fri Sep 16 20:19:24 2022 +0200 Revert "{pyhoca-cli, pyhoca/cli/frontend.py}: Only look for private ssh keys if appropriate." This reverts commit 8ce1d32efe640cffe9c0bd97fd747503ba7ac5e9. This issue is temporarily reverted because it breaks ssh-agent based authentication. --- debian/changelog | 2 -- pyhoca-cli | 6 ------ pyhoca/cli/frontend.py | 3 +-- 3 files changed, 1 insertion(+), 10 deletions(-) diff --git a/debian/changelog b/debian/changelog index 8e89310..12553f7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -24,8 +24,6 @@ pyhoca-cli (0.6.1.3-0x2go1) UNRELEASED; urgency=medium - Fix typo in man page. - Add --non-interactive cmdline option for forcefully preventing password queries on the TTY. - - {pyhoca-cli, pyhoca/cli/frontend.py}: Only look for private ssh keys if - appropriate. -- X2Go Release Manager <git-admin@x2go.org> Thu, 26 Dec 2019 17:03:42 +0100 diff --git a/pyhoca-cli b/pyhoca-cli index d535699..fd08ad9 100755 --- a/pyhoca-cli +++ b/pyhoca-cli @@ -498,12 +498,6 @@ Possible values for the --pack NX option are: if not a.ssh_privkey and os.path.isfile('%s/.ssh/id_dsa' % current_home): a.ssh_privkey = '%s/.ssh/id_dsa' % current_home - # only look for ssh keys if no ssh privkey is specified - if a.ssh_privkey: - a.look_for_keys = False - else: - a.look_for_keys = True - # hang around the keyboard chaos... a.kbd_type = a.kbd_type.lower() a.kbd_layout = a.kbd_layout.lower() diff --git a/pyhoca/cli/frontend.py b/pyhoca/cli/frontend.py index 3b0f145..c3bc74b 100644 --- a/pyhoca/cli/frontend.py +++ b/pyhoca/cli/frontend.py @@ -476,8 +476,7 @@ class PyHocaCLI(x2go.X2GoClient): allow_share_local_folders=allow_share_local_folders, forward_sshagent=self.args.forward_sshagent, clipboard=self.args.clipboard_mode, - cmd=self.args.command, - look_for_keys=self.args.look_for_keys) + cmd=self.args.command) def authenticate(self): """\ -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/pyhoca-cli.git