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

db: read also non-repository package index if reading repository indexes 

otherwise regeneration of non-repository index might go wrong or we
might delete too many files from cache when doing 'cache clean'.
cute-signatures
Timo Teras 2010-03-01 11:20:17 +02:00
parent 2d7171b2e7
commit fcdb316ab7
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/database.c
View File

@ -897,14 +897,6 @@ static int apk_db_read_state(struct apk_database *db, int flags)
bs->close(bs, NULL); bs->close(bs, NULL);
} }
if (apk_db_cache_active(db)) {
bs = apk_bstream_from_file(db->cache_fd, "installed");
if (bs != NULL) {
apk_db_index_read(db, bs, -2);
bs->close(bs, NULL);
}
}
bs = apk_bstream_from_file(db->root_fd, "var/lib/apk/triggers"); bs = apk_bstream_from_file(db->root_fd, "var/lib/apk/triggers");
if (bs != NULL) { if (bs != NULL) {
apk_db_triggers_read(db, bs); apk_db_triggers_read(db, bs);
@ -1139,6 +1131,14 @@ int apk_db_open(struct apk_database *db, struct apk_db_options *dbopts)
} }
if (!(dbopts->open_flags & APK_OPENF_NO_REPOS)) { if (!(dbopts->open_flags & APK_OPENF_NO_REPOS)) {
if (apk_db_cache_active(db)) {
bs = apk_bstream_from_file(db->cache_fd, "installed");
if (bs != NULL) {
apk_db_index_read(db, bs, -2);
bs->close(bs, NULL);
}
}
list_for_each_entry(repo, &dbopts->repository_list, list) { list_for_each_entry(repo, &dbopts->repository_list, list) {
r = apk_db_add_repository(db, APK_BLOB_STR(repo->url)); r = apk_db_add_repository(db, APK_BLOB_STR(repo->url));
rr = r ?: rr; rr = r ?: rr;