From fb5178c3c512b3f29d35548b62cce5b74e4651c1 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Sun, 1 Dec 2024 13:54:53 +0000 Subject: [PATCH] nixos-rebuild-ng: set capture_output=True to cleanup_ssh --- .../ni/nixos-rebuild-ng/src/nixos_rebuild/process.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/process.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/process.py index 946cc70f6a69..07d01c6f121b 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/process.py +++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/process.py @@ -71,8 +71,10 @@ class RunKwargs(TypedDict, total=False): def cleanup_ssh() -> None: "Close SSH ControlMaster connection." for ctrl in TMPDIR_PATH.glob("ssh-*"): - subprocess.run( - ["ssh", "-o", f"ControlPath={ctrl}", "-O", "exit", "dummyhost"], check=False + run_wrapper( + ["ssh", "-o", f"ControlPath={ctrl}", "-O", "exit", "dummyhost"], + check=False, + capture_output=True, ) TMPDIR.cleanup()