From 123226bad255ec6918aea7b837369a8d32084329 Mon Sep 17 00:00:00 2001 From: Timo Teras Date: Fri, 31 Jul 2009 19:35:08 +0300 Subject: db: load cache's installed index only if cache is active other wise cache_fd points to var/lib/apk and contains the real installed db causing it to be loaded twice. --- src/database.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/database.c b/src/database.c index e71f4c2..f6121b3 100644 --- a/src/database.c +++ b/src/database.c @@ -749,10 +749,12 @@ static int apk_db_read_state(struct apk_database *db, int flags) bs->close(bs, NULL); } - bs = apk_bstream_from_file(db->cache_fd, "installed"); - if (bs != NULL) { - apk_db_index_read(db, bs, -2); - 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); + } } } -- cgit v1.2.3-70-g09d2