Gentoo Archives: gentoo-commits

From: "Andreas K. Hüttel" <dilfridge@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/releng:master commit in: tools/
Date: Thu, 02 Mar 2023 18:32:29
Message-Id: 1677781728.249185d4274624bc9b8cce1acc0819cf95192180.dilfridge@gentoo
1 commit: 249185d4274624bc9b8cce1acc0819cf95192180
2 Author: Nic Boet <nic <AT> boet <DOT> cc>
3 AuthorDate: Thu Mar 2 18:28:48 2023 +0000
4 Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
5 CommitDate: Thu Mar 2 18:28:48 2023 +0000
6 URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=249185d4
7
8 snapshot_cache was removed from catalyst Apr 2020
9
10 * catalyst commit 6493f3bc534f97468c514a12035b10e3107c4ecf
11 * --preclean would now fail as catalyst.conf is invalid
12
13 Signed-off-by: Nic Boet <nic <AT> boet.cc>
14 Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
15
16 tools/catalyst-auto | 7 +------
17 1 file changed, 1 insertion(+), 6 deletions(-)
18
19 diff --git a/tools/catalyst-auto b/tools/catalyst-auto
20 index c6b303f5..7c298699 100755
21 --- a/tools/catalyst-auto
22 +++ b/tools/catalyst-auto
23 @@ -329,14 +329,9 @@ run_catalyst_commands() {
24 if [[ ${preclean} == 1 ]]; then
25 rm -rf "${TMP_PATH:-/tmp}/catalyst-auto".*
26
27 - snapshot_cache=$(catalyst_var snapshot_cache)
28 - if [[ -z ${snapshot_cache} ]]; then
29 - echo "error: snapshot_cache not set in config file"
30 - exit 1
31 - fi
32 pushd "${BUILD_SRCDIR_BASE}" >/dev/null || exit 1
33 rm -rf --one-file-system \
34 - kerncache packages snapshots tmp "${snapshot_cache}"/*
35 + kerncache packages snapshots tmp
36 popd >/dev/null
37 fi