From d704aae2cff68bb6dd409c7467dca78f956d713a Mon Sep 17 00:00:00 2001
From: Thiago Kenji Okada <thiagokokada@gmail.com>
Date: Sun, 1 Dec 2024 13:10:47 +0000
Subject: [PATCH] nixos-rebuild-ng: add logging for captured output values

---
 .../ni/nixos-rebuild-ng/src/nixos_rebuild/process.py     | 9 +++++++--
 1 file changed, 7 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 1232275d23c3..946cc70f6a69 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
@@ -118,14 +118,14 @@ def run_wrapper(
             args = ["sudo", *args]
 
     logger.debug(
-        "calling run with args=%s, kwargs=%s, extra_env=%s",
+        "calling run with args=%r, kwargs=%r, extra_env=%r",
         args,
         kwargs,
         extra_env,
     )
 
     try:
-        return subprocess.run(
+        r = subprocess.run(
             args,
             check=check,
             env=env,
@@ -136,6 +136,11 @@ def run_wrapper(
             errors="surrogateescape",
             **kwargs,
         )
+
+        if kwargs.get("capture_output") or kwargs.get("stderr") or kwargs.get("stdout"):
+            logger.debug("captured output stdout=%r, stderr=%r", r.stdout, r.stderr)
+
+        return r
     except subprocess.CalledProcessError:
         if sudo and remote:
             logger.error(