mirrors/kitty
1
0
Fork 0
mirror of https://github.com/kovidgoyal/kitty synced 2026-07-25 17:52:02 +02:00
Code Issues Packages Projects Releases Wiki Activity

Make usage of need_to_request_data clearer

Browse Source
This commit is contained in:
Kovid Goyal
2022-03-15 15:51:49 +05:30
parent 5099dd6aa3
commit daa673eff1
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
kittens/ssh/main.py
View File

@@ -571,14 +571,13 @@ def run_ssh(ssh_args: List[str], server_args: List[str], found_extra_args: Tuple
if use_control_master: if use_control_master:
cmd[insertion_point:insertion_point] = connection_sharing_args(host_opts, int(os.environ['KITTY_PID'])) cmd[insertion_point:insertion_point] = connection_sharing_args(host_opts, int(os.environ['KITTY_PID']))
use_kitty_askpass = host_opts.askpass == 'native' or (host_opts.askpass == 'unless-set' and 'SSH_ASKPASS' not in os.environ) use_kitty_askpass = host_opts.askpass == 'native' or (host_opts.askpass == 'unless-set' and 'SSH_ASKPASS' not in os.environ)
need_to_request_data = True
if use_kitty_askpass: if use_kitty_askpass:
# SSH_ASKPASS_REQUIRE was introduced in 8.4 release on 2020-09-27 # SSH_ASKPASS_REQUIRE was introduced in 8.4 release on 2020-09-27
if os.environ.get('DISPLAY') or ssh_version() >= (8, 4): if os.environ.get('DISPLAY') or ssh_version() >= (8, 4):
need_to_request_data = False
os.environ['SSH_ASKPASS_REQUIRE'] = 'force' os.environ['SSH_ASKPASS_REQUIRE'] = 'force'
os.environ['SSH_ASKPASS'] = os.path.join(shell_integration_dir, 'ssh', 'askpass.py') os.environ['SSH_ASKPASS'] = os.path.join(shell_integration_dir, 'ssh', 'askpass.py')
else:
use_kitty_askpass = False
need_to_request_data = not use_kitty_askpass
with restore_terminal_state() as echo_on: with restore_terminal_state() as echo_on:
rcmd, replacements, shm_name = get_remote_command( rcmd, replacements, shm_name = get_remote_command(
remote_args, host_opts, hostname, hostname_for_match, uname, echo_on, request_data=need_to_request_data) remote_args, host_opts, hostname, hostname_for_match, uname, echo_on, request_data=need_to_request_data)