From 3d8b0daa1ae49a7cf93a09273a7dbad3024ce256 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Mon, 16 Dec 2024 18:53:05 +0000 Subject: [PATCH] nixos-rebuild-ng: move atexit.register(cleanup_ssh) to process --- .../by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py | 3 --- pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/process.py | 4 ++++ 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py index ab406e7e0d87..de851516d3bf 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py +++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py @@ -1,5 +1,4 @@ import argparse -import atexit import json import logging import os @@ -293,8 +292,6 @@ def execute(argv: list[str]) -> None: if not WITH_NIX_2_18: logger.warning("you're using Nix <2.18, some features will not work correctly") - atexit.register(cleanup_ssh) - common_flags = vars(args_groups["common_flags"]) common_build_flags = common_flags | vars(args_groups["common_build_flags"]) build_flags = common_build_flags | vars(args_groups["classic_build_flags"]) 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 337fae18b2ff..f7c83f714937 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 @@ -1,3 +1,4 @@ +import atexit import logging import os import shlex @@ -76,6 +77,9 @@ def cleanup_ssh() -> None: ) +atexit.register(cleanup_ssh) + + def run_wrapper( args: Sequence[str | bytes | os.PathLike[str] | os.PathLike[bytes]], *,