dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

nixos-rebuild-ng: add allow_tty parameter to process.run_wrapper

Browse Source
This commit is contained in:
Thiago Kenji Okada 2024-11-24 20:30:17 +00:00
parent 8bd70ef699
commit 56203bca4e
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/process.py
View File

@ -22,6 +22,7 @@ def run_wrapper(
check: bool, # make it explicit so we always know if the code is handling errors check: bool, # make it explicit so we always know if the code is handling errors
env: dict[str, str] | None = None, # replaces the current environment env: dict[str, str] | None = None, # replaces the current environment
extra_env: dict[str, str] | None = None, # appends to the current environment extra_env: dict[str, str] | None = None, # appends to the current environment
allow_tty: bool = True,
remote: Ssh | None = None, remote: Ssh | None = None,
sudo: bool = False, sudo: bool = False,
**kwargs: Unpack[RunKwargs], **kwargs: Unpack[RunKwargs],
@ -34,7 +35,15 @@ def run_wrapper(
args = ["env", *extra_env_args, *args] args = ["env", *extra_env_args, *args]
if sudo: if sudo:
args = ["sudo", *args] args = ["sudo", *args]
if remote.tty: if allow_tty:
# SSH's TTY will redirect all output to stdout, that may cause
# unwanted effects when used
assert not kwargs.get(
"capture_output"
), "SSH's TTY is incompatible with capture_output"
assert not kwargs.get("stderr"), "SSH's TTY is incompatible with stderr"
assert not kwargs.get("stdout"), "SSH's TTY is incompatible with stdout"
if allow_tty and remote.tty:
args = ["ssh", "-t", *remote.opts, remote.host, "--", *args] args = ["ssh", "-t", *remote.opts, remote.host, "--", *args]
else: else:
args = ["ssh", *remote.opts, remote.host, "--", *args] args = ["ssh", *remote.opts, remote.host, "--", *args]