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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id A73161382C5 for ; Tue, 12 May 2020 05:47:25 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D4DB5E090E; Tue, 12 May 2020 05:47:24 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B791DE090E for ; Tue, 12 May 2020 05:47:24 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id AD8E834FE42 for ; Tue, 12 May 2020 05:47:23 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 01B4D1F6 for ; Tue, 12 May 2020 05:47:22 +0000 (UTC) From: "Robin H. Johnson" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Robin H. Johnson" Message-ID: <1589262394.62bfd232bb9a2312be840f717f692da5d6db808a.robbat2@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: robbat2 X-VCS-Committer-Name: Robin H. Johnson X-VCS-Revision: 62bfd232bb9a2312be840f717f692da5d6db808a X-VCS-Branch: master Date: Tue, 12 May 2020 05:47:22 +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: 7e4b6f20-c5ec-4c5c-bfe9-827f717f7aee X-Archives-Hash: f5c316e0803da24f09ab172c81444d91 commit: 62bfd232bb9a2312be840f717f692da5d6db808a Author: Robin H. Johnson gentoo org> AuthorDate: Tue May 12 05:46:34 2020 +0000 Commit: Robin H. Johnson gentoo org> CommitDate: Tue May 12 05:46:34 2020 +0000 URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=62bfd232 catalyst-auto: defer purge until all sets are done Signed-off-by: Robin H. Johnson gentoo.org> tools/catalyst-auto | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/tools/catalyst-auto b/tools/catalyst-auto index efa7a99d..e6e7f30f 100755 --- a/tools/catalyst-auto +++ b/tools/catalyst-auto @@ -421,11 +421,25 @@ run_catalyst_commands() { fi done + # Do not purge yet, because there might be interdendency between specs + # in different build sets! + + update_symlinks + done + + # Now do the cleanup + for a in "" ${SETS}; do + if [[ -z ${a} ]]; then + specs_var="SPECS" + optional_specs_var="OPTIONAL_SPECS" + else + specs_var="SET_${a}_SPECS" + optional_specs_var="SET_${a}_OPTIONAL_SPECS" + fi for i in ${!specs_var} ${!optional_specs_var}; do LOGFILE="${TMPDIR}/log/$(echo "${i}" | sed -e 's:/:_:' -e 's:\.spec$::')_purge.log" run_cmd "${LOGFILE}" "${timeprefix[@]}" catalyst --purgetmponly -c "${CATALYST_CONFIG}" -f "${i}" done - update_symlinks done