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 976353858286 for ; Mon, 11 Mar 2024 19:03:44 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 976353858286 Authentication-Results: sourceware.org; dmarc=fail (p=none dis=none) header.from=efficios.com Authentication-Results: sourceware.org; spf=fail smtp.mailfrom=efficios.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 976353858286 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=1710183826; cv=none; b=sU3M8A9CuXiIiH4wILOHpu5KnAqn2XJMJolKso3ivNOUK7MjmK64ZALabgn+372loEjnHTNukTduWx/17/ZcM2s3Cmp/mctP/sYob6OvgWQhqHWogd1yl3tV2sjXEhNcHimkxVm4hI8iTHmGLDVF4pe0jRcnR6Z4O77ZvTLiWak= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1710183826; c=relaxed/simple; bh=jkX3t80KpY7ETcvq1zWiMcheuSV9ZmsKHUFUhqGuD1c=; h=From:To:Subject:Date:Message-ID:MIME-Version; b=UC63IiCuCxhBKYuBchAAEXArkGAjQ8TQ14UIwLAlQA+aeNSOsyOKbN5HGRhOjRUtZ11cm6p+oDG6RNrcNyaCsAOd0pCl35IQUVsluPYaA/64K7F9dztvqmySy91Vj+xzH0A/pJsII5dl3kfw/QzPafo12QOgrlnGyhu39cw/j2s= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from smarchi-efficios.internal.efficios.com (192-222-143-198.qc.cable.ebox.net [192.222.143.198]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by simark.ca (Postfix) with ESMTPSA id 2E15F1E0FB; Mon, 11 Mar 2024 15:03:44 -0400 (EDT) From: Simon Marchi To: buildbot@sourceware.org Cc: Simon Marchi Subject: [PATCH 4/8] autoregen.py: capitalize some constant names Date: Mon, 11 Mar 2024 15:01:16 -0400 Message-ID: <20240311190341.235331-5-simon.marchi@efficios.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240311190341.235331-1-simon.marchi@efficios.com> References: <20240311190341.235331-1-simon.marchi@efficios.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-3496.4 required=5.0 tests=BAYES_00,GIT_PATCH_0,KAM_DMARC_NONE,KAM_DMARC_STATUS,SPF_HELO_PASS,SPF_SOFTFAIL,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: Following the "convention" that constant names are capitalized, capitalize the other constants names set at the beginning of the script. --- builder/containers/autoregen.py | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/builder/containers/autoregen.py b/builder/containers/autoregen.py index 26006ff18e0a..e63436111246 100755 --- a/builder/containers/autoregen.py +++ b/builder/containers/autoregen.py @@ -8,16 +8,16 @@ from pathlib import Path # On Gentoo, vanilla unpatched autotools are packaged separately. # We place the vanilla names first as we want to prefer those if both exist. -autoconf_names = ["autoconf-vanilla-2.69", "autoconf-2.69"] -automake_names = ["automake-vanilla-1.15", "automake-1.15.1"] -aclocal_names = ["aclocal-vanilla-1.15", "aclocal-1.15.1"] -autoheader_names = ["autoheader-vanilla-2.69", "autoheader-2.69"] +AUTOCONF_NAMES = ["autoconf-vanilla-2.69", "autoconf-2.69"] +AUTOMAKE_NAMES = ["automake-vanilla-1.15", "automake-1.15.1"] +ACLOCAL_NAMES = ["aclocal-vanilla-1.15", "aclocal-1.15.1"] +AUTOHEADER_NAMES = ["autoheader-vanilla-2.69", "autoheader-2.69"] # Pick the first for each list that exists on this system. -AUTOCONF_BIN = next(name for name in autoconf_names if shutil.which(name)) -AUTOMAKE_BIN = next(name for name in automake_names if shutil.which(name)) -ACLOCAL_BIN = next(name for name in aclocal_names if shutil.which(name)) -AUTOHEADER_BIN = next(name for name in autoheader_names if shutil.which(name)) +AUTOCONF_BIN = next(name for name in AUTOCONF_NAMES if shutil.which(name)) +AUTOMAKE_BIN = next(name for name in AUTOMAKE_NAMES if shutil.which(name)) +ACLOCAL_BIN = next(name for name in ACLOCAL_NAMES if shutil.which(name)) +AUTOHEADER_BIN = next(name for name in AUTOHEADER_NAMES if shutil.which(name)) # autoconf-wrapper and automake-wrapper from Gentoo look at this environment variable. # It's harmless to set it on other systems though. @@ -34,12 +34,13 @@ ENV = " ".join( # Directories we should skip entirely because they're vendored or have different # autotools versions. -skip_dirs = [ +SKIP_DIRS = [ # readline and minizip are maintained with different autotools versions "readline", "minizip", ] + config_folders: list[Path] = [] for root, _, files in os.walk("."): @@ -50,7 +51,7 @@ for root, _, files in os.walk("."): for folder in sorted(config_folders): print(folder, flush=True) - if folder.stem in skip_dirs: + if folder.stem in SKIP_DIRS: continue os.chdir(folder) -- 2.44.0