diff options
| author | Max Rees <maxcrees@me.com> | 2019-08-10 02:08:10 -0500 |
|---|---|---|
| committer | Max Rees <maxcrees@me.com> | 2020-12-29 21:29:17 -0500 |
| commit | 306246f43371a70da3c39e80b40fec515357a174 (patch) | |
| tree | 504102ae0bdc8a3947e11cdd5f83da35bd41675e /src/app_cache.c | |
| parent | 3890035c21e40aca7d5360bfc40e4b7ab9f10c50 (diff) | |
| download | apk-tools-for-alpine/cache-errors.tar.gz apk-tools-for-alpine/cache-errors.tar.bz2 apk-tools-for-alpine/cache-errors.tar.xz apk-tools-for-alpine/cache-errors.zip | |
cache: report errors when unlinkingfor-alpine/cache-errors
Before:
$ abuild-apk del mutt
(1/3) Purging mutt (1.12.1-r0)
(2/3) Purging gdbm (1.18.1-r0)
(3/3) Purging libidn (1.35-r0)
OK: 3752 MiB in 805 packages
$ apk cache sync --purge || echo nope, sorry
$ ls /home/apk-cache/*gdbm*
/home/apk-cache/gdbm-1.18.1-r0.b0b17e93.apk
After:
$ apk cache sync --purge || echo nope, sorry
ERROR: Unable to delete gdbm-1.18.1-r0.b0b17e93.apk: Permission denied
nope, sorry
Diffstat (limited to 'src/app_cache.c')
| -rw-r--r-- | src/app_cache.c | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/src/app_cache.c b/src/app_cache.c index f4dd951..75d27c2 100644 --- a/src/app_cache.c +++ b/src/app_cache.c @@ -13,6 +13,7 @@ #include <dirent.h> #include <unistd.h> #include <limits.h> +#include <string.h> #include "apk_defines.h" #include "apk_applet.h" @@ -108,35 +109,42 @@ static int cache_download(struct cache_ctx *cctx, struct apk_database *db) return ret; } -static void cache_clean_item(struct apk_database *db, int dirfd, const char *name, struct apk_package *pkg) +static int cache_clean_item(struct apk_database *db, int dirfd, const char *name, struct apk_package *pkg) { char tmp[PATH_MAX]; apk_blob_t b; int i; - if (strcmp(name, "installed") == 0) return; + if (strcmp(name, "installed") == 0) return 0; if (pkg) { if ((apk_flags & APK_PURGE) && pkg->ipkg == NULL) 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; + return 0; } b = APK_BLOB_STR(name); for (i = 0; i < db->num_repos; i++) { /* Check if this is a valid index */ apk_repo_format_cache_index(APK_BLOB_BUF(tmp), &db->repos[i]); - if (apk_blob_compare(b, APK_BLOB_STR(tmp)) == 0) return; + if (apk_blob_compare(b, APK_BLOB_STR(tmp)) == 0) return 0; } delete: if (apk_verbosity >= 2) apk_message("deleting %s", name); if (!(apk_flags & APK_SIMULATE)) { - if (unlinkat(dirfd, name, 0) < 0 && errno == EISDIR) - unlinkat(dirfd, name, AT_REMOVEDIR); + if (unlinkat(dirfd, name, 0) < 0) { + if (errno != EISDIR || + (errno == EISDIR && unlinkat(dirfd, name, AT_REMOVEDIR) < 0)) { + apk_error("Unable to delete %s: %s", name, strerror(errno)); + return -errno; + } + } } + + return 0; } static int cache_clean(struct apk_database *db) |