From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 82D47158041 for ; Tue, 19 Mar 2024 16:14:30 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A3E4FE29AA; Tue, 19 Mar 2024 16:14:29 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 85C51E29AA for ; Tue, 19 Mar 2024 16:14:29 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 6FC3033BF39 for ; Tue, 19 Mar 2024 16:14:28 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D4D8E14F1 for ; Tue, 19 Mar 2024 16:14:26 +0000 (UTC) From: "Ben Kohler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ben Kohler" Message-ID: <1710864851.bd05aec8bee69ea770ca6b64d852a9fba3326a68.bkohler@gentoo> Subject: [gentoo-commits] proj/releng:master commit in: tools/ X-VCS-Repository: proj/releng X-VCS-Files: tools/catalyst-auto X-VCS-Directories: tools/ X-VCS-Committer: bkohler X-VCS-Committer-Name: Ben Kohler X-VCS-Revision: bd05aec8bee69ea770ca6b64d852a9fba3326a68 X-VCS-Branch: master Date: Tue, 19 Mar 2024 16:14:26 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 7eb135f2-d9fe-4749-9c7f-e92ad8364d9a X-Archives-Hash: 3ae11afc5f42869700108ff68d117711 commit: bd05aec8bee69ea770ca6b64d852a9fba3326a68 Author: Ben Kohler gentoo org> AuthorDate: Tue Mar 19 16:13:35 2024 +0000 Commit: Ben Kohler gentoo org> CommitDate: Tue Mar 19 16:14:11 2024 +0000 URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=bd05aec8 catalyst-auto: allow skipping cleaning with CLST_AUTO_NOCLEAN var Signed-off-by: Ben Kohler gentoo.org> tools/catalyst-auto | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tools/catalyst-auto b/tools/catalyst-auto index 3ee19d15..9624cebb 100755 --- a/tools/catalyst-auto +++ b/tools/catalyst-auto @@ -542,6 +542,9 @@ run_catalyst_commands() { for i in ${!specs_var} ${!optional_specs_var}; do LOGFILE="${TMPDIR}/log/$(echo "${i}" | sed -e 's:/:_:' -e 's:\.spec$::')_purge.log" specpath=$(readlink -f "${i}") + # Bail out of cleaning (eg) stage3-openrc.spec failure if + # CLST_AUTO_NOCLEAN="stage3-openrc.spec" is set + [[ ${CLST_AUTO_NOCLEAN} == *${i}* ]] || run_cmd "${LOGFILE}" "${timeprefix[@]}" catalyst --purgetmponly -c "${CATALYST_CONFIG}" -f "${specpath}" done update_symlinks