From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca (simark.ca [158.69.221.121]) by sourceware.org (Postfix) with ESMTPS id 3DAC53858CD1 for ; Tue, 12 Mar 2024 01:53:42 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 3DAC53858CD1 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=simark.ca Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=simark.ca ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 3DAC53858CD1 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=158.69.221.121 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1710208446; cv=none; b=I3LA3a4uZ375mZRQtwi8+lwdky7JQrF86SOSQ2rwXSu84KDleE2s/mbxaO6xopfzXEY/0AjnXkSVWiBY+hSGm+CrxQpaHliJbz3jAhvdfTQ58JL2+bXKjv1zmor06PYEawuCKtTvDlwKfGLm4D9B+ASUOKlhGW0Qhivs3rT9ewY= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1710208446; c=relaxed/simple; bh=NVLz7D6E4lvtrldBTOzdqxD9Z5qOHloy73xvtSTFKaU=; h=DKIM-Signature:Message-ID:Date:MIME-Version:Subject:To:From; b=osCseqqPuhyem4xCIMl1rM9ktPXCt9klfifsoCRrS3mfsujkXv0q0K8ZcMqdNoj8eyuwwSdEd505yrPAK4p5+3vVKmDq4eDRw7bILfNccX2iA9ZYBz2XC0/RyJLVapPGraFxZ4yxUsb58TkhYauBPA2qEYZw5enoMDyqRF5zuKA= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=simark.ca; s=mail; t=1710208421; bh=NVLz7D6E4lvtrldBTOzdqxD9Z5qOHloy73xvtSTFKaU=; h=Date:Subject:To:Cc:References:From:In-Reply-To:From; b=ltsD4zKMePvg6WklNUcFaW1yQgJt3vq79/Ix4aiBfGe/gp+coYiM0/AHCdpDKhF7C Cy7AohtGvyZVth6yDuTnkpxXkameGLXEXifHOfhRyIprDXO/Qejqu33cazHnphuTut 4Qg9eFet0d298ba/yHp9QmYwyVpArlA2OiyAHU2s= Received: from [10.0.0.11] (modemcable238.237-201-24.mc.videotron.ca [24.201.237.238]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by simark.ca (Postfix) with ESMTPSA id 3BBAF1E030; Mon, 11 Mar 2024 21:53:40 -0400 (EDT) Message-ID: <0d0dc333-0359-4e49-9197-01bf636b4351@simark.ca> Date: Mon, 11 Mar 2024 21:53:40 -0400 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH 0/8] Some changes to autoregen.py Content-Language: en-US To: Mark Wielaard , Sam James Cc: Simon Marchi , buildbot@sourceware.org References: <20240311190341.235331-1-simon.marchi@efficios.com> <87o7bkmqep.fsf@gentoo.org> <20240311215237.GH30331@gnu.wildebeest.org> From: Simon Marchi In-Reply-To: <20240311215237.GH30331@gnu.wildebeest.org> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=-10.7 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,SPF_HELO_PASS,SPF_PASS,TXREP,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: 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 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