From b58ec46f7cc53cbea580a87a6bf9da0c8b0fdc26 Mon Sep 17 00:00:00 2001 From: Timo Teras Date: Tue, 22 Dec 2009 17:33:44 +0200 Subject: db: make fdb load package description before calling pkg_install this is now mandatory after the overlay fixes. otherwise the package will not get listed as installed. --- src/database.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/database.c') diff --git a/src/database.c b/src/database.c index 1c6ae9e..5118f5c 100644 --- a/src/database.c +++ b/src/database.c @@ -581,13 +581,9 @@ int apk_db_index_read(struct apk_database *db, struct apk_bstream *bs, int repo) /* If no package, create new */ if (pkg == NULL) { pkg = apk_pkg_new(); + ipkg = NULL; diri = NULL; file_diri_node = NULL; - - if (repo == -1) { - ipkg = apk_pkg_install(db, pkg); - diri_node = hlist_tail_ptr(&ipkg->owned_dirs); - } } /* Standard index line? */ @@ -598,6 +594,10 @@ int apk_db_index_read(struct apk_database *db, struct apk_bstream *bs, int repo) apk_error("Invalid index entry '%c'", field); return -1; } + if (ipkg == NULL) { + ipkg = apk_pkg_install(db, pkg); + diri_node = hlist_tail_ptr(&ipkg->owned_dirs); + } /* Check FDB special entries */ switch (field) { -- cgit v1.2.3-70-g09d2