summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorTimo Teräs <timo.teras@iki.fi>2020-10-06 14:23:14 +0300
committerTimo Teräs <timo.teras@iki.fi>2020-10-06 14:27:59 +0300
commit3fae0c693fa58a8e154a1d3b47497538b6230655 (patch)
treef3f0f420d2d795c5de678a52a6e420fd1a030534 /src
parent7158474f1ba2bd24c6a9b2b1bbd53984414c0343 (diff)
downloadapk-tools-3fae0c693fa58a8e154a1d3b47497538b6230655.tar.gz
apk-tools-3fae0c693fa58a8e154a1d3b47497538b6230655.tar.bz2
apk-tools-3fae0c693fa58a8e154a1d3b47497538b6230655.tar.xz
apk-tools-3fae0c693fa58a8e154a1d3b47497538b6230655.zip
db: make the --repositories-file change more announced
Document the version when changed. And print error with similar note if the given repositories-file cannot be read.
Diffstat (limited to 'src')
-rw-r--r--src/database.c10
1 files changed, 7 insertions, 3 deletions
diff --git a/src/database.c b/src/database.c
index e5d8b86..22004bc 100644
--- a/src/database.c
+++ b/src/database.c
@@ -1406,15 +1406,19 @@ static int add_repos_from_file(void *ctx, int dirfd, const char *file)
struct apk_database *db = (struct apk_database *) ctx;
apk_blob_t blob;
- if (dirfd != db->root_fd) {
+ if (dirfd != AT_FDCWD && dirfd != db->root_fd) {
/* loading from repositories.d; check extension */
if (!file_ends_with_dot_list(file))
return 0;
}
blob = apk_blob_from_file(dirfd, file);
- if (APK_BLOB_IS_NULL(blob))
- return 0;
+ if (APK_BLOB_IS_NULL(blob)) {
+ if (dirfd != AT_FDCWD) return 0;
+ apk_error("failed to read repositories: %s", file);
+ apk_message("NOTE: --repositories-file is relative to the startup directory since apk 2.12.0_rc2");
+ return -ENOENT;
+ }
apk_blob_for_each_segment(blob, "\n", apk_db_add_repository, db);
free(blob.ptr);