Re: [PATCH 0/8] Some changes to autoregen.py

[Simon Marchi <simark@simark.ca>]

On 2024-03-11 17:52, Mark Wielaard wrote:
> I think it is a little too verbose now. Printing the ENV seems a bit
> busy. But for being clear what exactly is happening I guess it is nice.

Well, my initial implementation didn't show the env, but I made it show
it to be accurate.  But we could print the env only once at the
beginning.

Here's a patch that does it.


From 0ea23b4d42ae9c026f9d0dc5030a1bf38b4ccfcc Mon Sep 17 00:00:00 2001
From: Simon Marchi <simon.marchi@polymtl.ca>
Date: Mon, 11 Mar 2024 21:47:28 -0400
Subject: [PATCH] auroregen.py: print environment only once at the beginning

Reduce the duplication in the output a bit by printing the environment
variables passed to all commands only once at the beginning.

Note that the previous code ended up putting {ENV} twice in the command,
which is harmless but unnecessary.
---
 builder/containers/autoregen.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/builder/containers/autoregen.py b/builder/containers/autoregen.py
index ba77320c7248..ac16f54f6caa 100755
--- a/builder/containers/autoregen.py
+++ b/builder/containers/autoregen.py
@@ -46,7 +46,6 @@ SKIP_DIRS = [
 #
 # Print the command on stdout prior to running it.
 def run_shell(cmd: str):
-    cmd = f"{ENV} {cmd}"
     print(f"+ {cmd}")
     res = subprocess.run(
         f"{ENV} {cmd}",
@@ -63,6 +62,8 @@ run_shell(f"{AUTOMAKE_BIN} --version")
 run_shell(f"{ACLOCAL_BIN} --version")
 run_shell(f"{AUTOHEADER_BIN} --version")
 
+print(f"Environment: {ENV}")
+
 config_folders: list[Path] = []
 
 for root, _, files in os.walk("."):

base-commit: de502b23299f15eeca710034218e35819dec5e38
-- 
2.44.0