yadunut/clan-core
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Host: always set needs_user_terminal for ssh commands, only override prefix if given by user

Browse Source
This commit is contained in:
Jörg Thalheim
2025-05-02 13:34:55 +02:00
parent 03731a2a67
commit f5277c989a
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/clan-cli/clan_cli/ssh/host.py
View File

@@ -122,6 +122,9 @@ class Host:
if extra_env is None: if extra_env is None:
extra_env = {} extra_env = {}
if opts is None:
opts = RunOpts()
# If we are not root and we need to become root, prepend sudo # If we are not root and we need to become root, prepend sudo
sudo = "" sudo = ""
if become_root and self.user != "root": if become_root and self.user != "root":
@@ -132,11 +135,10 @@ class Host:
for k, v in extra_env.items(): for k, v in extra_env.items():
env_vars.append(f"{shlex.quote(k)}={shlex.quote(v)}") env_vars.append(f"{shlex.quote(k)}={shlex.quote(v)}")
if opts is None: if opts.prefix is None:
opts = RunOpts()
else:
opts.needs_user_terminal = True
opts.prefix = self.command_prefix opts.prefix = self.command_prefix
# always set needs_user_terminal to True because ssh asks for passwords
opts.needs_user_terminal = True
if opts.cwd is not None: if opts.cwd is not None:
msg = "cwd is not supported for remote commands" msg = "cwd is not supported for remote commands"