jaiden
/
apk-tools
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

db: make --repositories-file relative to host root 

It used to be relative to the --root specified root, but that
causes issues with relative command line filenames and is unintuitive.
Update documentation accordingly. Fixes #10702.
cute-signatures
Timo Teräs 2020-10-03 15:38:35 +03:00
parent 6cedfe27ac
commit 7c2a3657fb
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
doc/apk.8.scd
View File

@ -155,9 +155,9 @@ The following options are available for all commands.
packages from cache on cache clean. packages from cache on cache clean.
*--repositories-file* _REPOFILE_ *--repositories-file* _REPOFILE_
Override repositories file, see *apk-repositories*(8). This directory Override system repositories, see *apk-repositories*(8). Specifying this
is relative to _ROOT_. This can be used to override normal system option override the normal repositories file and repositories.d directory
repositories. processing.
*--wait* _TIME_ *--wait* _TIME_
Wait for TIME seconds to get an exclusive repository lock before Wait for TIME seconds to get an exclusive repository lock before

2
src/database.c
View File

@ -1700,7 +1700,7 @@ int apk_db_open(struct apk_database *db, struct apk_db_options *dbopts)
apk_dir_foreach_file(openat(db->root_fd, "etc/apk/repositories.d", O_RDONLY | O_CLOEXEC), apk_dir_foreach_file(openat(db->root_fd, "etc/apk/repositories.d", O_RDONLY | O_CLOEXEC),
add_repos_from_file, db); add_repos_from_file, db);
} else { } else {
add_repos_from_file(db, db->root_fd, dbopts->repositories_file); add_repos_from_file(db, AT_FDCWD, dbopts->repositories_file);
} }
if (db->repo_update_counter) if (db->repo_update_counter)