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 2E4BB158030 for ; Thu, 2 Mar 2023 18:32:29 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 60043E0825; Thu, 2 Mar 2023 18:32:28 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 pigeon.gentoo.org (Postfix) with ESMTPS id 4B274E0825 for ; Thu, 2 Mar 2023 18:32:28 +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 35B4433BEED for ; Thu, 2 Mar 2023 18:32:27 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 884E5888 for ; Thu, 2 Mar 2023 18:32:25 +0000 (UTC) From: "Andreas K. Hüttel" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas K. Hüttel" Message-ID: <1677781728.249185d4274624bc9b8cce1acc0819cf95192180.dilfridge@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: dilfridge X-VCS-Committer-Name: Andreas K. Hüttel X-VCS-Revision: 249185d4274624bc9b8cce1acc0819cf95192180 X-VCS-Branch: master Date: Thu, 2 Mar 2023 18:32:25 +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: b15b4a2e-9f02-485a-afd7-8604d791329f X-Archives-Hash: 9e8b60ebc9d52e24348432a71c7bce6a commit: 249185d4274624bc9b8cce1acc0819cf95192180 Author: Nic Boet boet cc> AuthorDate: Thu Mar 2 18:28:48 2023 +0000 Commit: Andreas K. Hüttel gentoo org> CommitDate: Thu Mar 2 18:28:48 2023 +0000 URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=249185d4 snapshot_cache was removed from catalyst Apr 2020 * catalyst commit 6493f3bc534f97468c514a12035b10e3107c4ecf * --preclean would now fail as catalyst.conf is invalid Signed-off-by: Nic Boet boet.cc> Signed-off-by: Andreas K. Hüttel gentoo.org> tools/catalyst-auto | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/tools/catalyst-auto b/tools/catalyst-auto index c6b303f5..7c298699 100755 --- a/tools/catalyst-auto +++ b/tools/catalyst-auto @@ -329,14 +329,9 @@ run_catalyst_commands() { if [[ ${preclean} == 1 ]]; then rm -rf "${TMP_PATH:-/tmp}/catalyst-auto".* - snapshot_cache=$(catalyst_var snapshot_cache) - if [[ -z ${snapshot_cache} ]]; then - echo "error: snapshot_cache not set in config file" - exit 1 - fi pushd "${BUILD_SRCDIR_BASE}" >/dev/null || exit 1 rm -rf --one-file-system \ - kerncache packages snapshots tmp "${snapshot_cache}"/* + kerncache packages snapshots tmp popd >/dev/null fi