From 6870c6023ebc1e190e5c06138391a3ae80ff975d Mon Sep 17 00:00:00 2001 From: Timo Teräs Date: Tue, 31 Jan 2023 15:14:54 +0200 Subject: cache: improve and document purging Document cache clean --purge better. Add a cache purge alias for it. And also purge installed package copies on disk installs. fixes #10857 --- src/app_cache.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/src/app_cache.c b/src/app_cache.c index 7239faa..13cd6ce 100644 --- a/src/app_cache.c +++ b/src/app_cache.c @@ -151,7 +151,9 @@ static void cache_clean_item(struct apk_database *db, int static_cache, int dirf if (!static_cache) { if (strcmp(name, "installed") == 0) return; if (pkg) { - if ((apk_flags & APK_PURGE) && pkg->ipkg == NULL) goto delete; + if (apk_flags & APK_PURGE) { + if (db->permanent || !pkg->ipkg) goto delete; + } if (pkg->repos & db->local_repos & ~BIT(APK_REPOSITORY_CACHED)) goto delete; if (pkg->ipkg == NULL && !(pkg->repos & ~BIT(APK_REPOSITORY_CACHED))) goto delete; return; @@ -193,13 +195,16 @@ static int cache_main(void *ctx, struct apk_database *db, struct apk_string_arra return -EINVAL; arg = args->item[0]; - if (strcmp(arg, "sync") == 0) + if (strcmp(arg, "sync") == 0) { actions = CACHE_CLEAN | CACHE_DOWNLOAD; - else if (strcmp(arg, "clean") == 0) + } else if (strcmp(arg, "clean") == 0) { actions = CACHE_CLEAN; - else if (strcmp(arg, "download") == 0) + } else if (strcmp(arg, "purge") == 0) { + actions = CACHE_CLEAN; + apk_flags |= APK_PURGE; + } else if (strcmp(arg, "download") == 0) { actions = CACHE_DOWNLOAD; - else + } else return -EINVAL; if (!apk_db_cache_active(db)) -- cgit v1.2.3-60-g2f50