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

Simplify hostname matching

Browse Source 
Now that we load the opts upfront, we can have load_config return the
final opts object itself
This commit is contained in:
Kovid Goyal
2022-03-15 11:25:21 +05:30
parent 9b0bd81661
commit 54c5faa12d
3 changed files with 44 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
kittens/ssh/main.py
View File

@@ -37,7 +37,7 @@ from kitty.types import run_once
from kitty.utils import SSHConnectionData, set_echo as turn_off_echo
from .completion import complete, ssh_options
from .config import init_config, options_for_host
from .config import init_config
from .copy import CopyInstruction
from .options.types import Options as SSHOptions
from .options.utils import DELETE_ENV_VAR
@@ -557,8 +557,7 @@ def run_ssh(ssh_args: List[str], server_args: List[str], found_extra_args: Tuple
overrides.append(aq)
if overrides:
overrides.insert(0, f'hostname {uname}@{hostname_for_match}')
so = init_config(overrides)
host_opts = options_for_host(hostname_for_match, uname, so)
host_opts = init_config(hostname_for_match, uname, overrides)
use_control_master = host_opts.share_connections
if use_control_master:
cmd[insertion_point:insertion_point] = connection_sharing_args(host_opts, int(os.environ['KITTY_PID']))