commit:     249185d4274624bc9b8cce1acc0819cf95192180
Author:     Nic Boet <nic <AT> boet <DOT> cc>
AuthorDate: Thu Mar  2 18:28:48 2023 +0000
Commit:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> 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 <nic <AT> boet.cc>
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> 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
 

Reply via email to