Commit 3fae0c69 authored by Timo Teräs's avatar Timo Teräs

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.
parent 7158474f
Pipeline #51754 passed with stage
in 40 seconds
......@@ -156,8 +156,9 @@ The following options are available for all commands.
*--repositories-file* _REPOFILE_
Override system repositories, see *apk-repositories*(8). Specifying this
option override the normal repositories file and repositories.d directory
processing.
option overrides the normal repositories file and repositories.d directory
processing. The given _REPOFILE_ is relative to the startup directory since
apk 2.12.0_rc2.
*--wait* _TIME_
Wait for TIME seconds to get an exclusive repository lock before
......
......@@ -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);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment