From f1125dfcde748300846f9fba07f29791ec980c1a Mon Sep 17 00:00:00 2001 From: Timo Teras Date: Wed, 8 Jul 2009 16:19:53 +0300 Subject: [PATCH] db: check cache directory early we need to know if caching is enabled, before the repositories are added. otherwise the cache is not used properly at db opening time. --- src/database.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/database.c b/src/database.c index 2edbadd..729d604 100644 --- a/src/database.c +++ b/src/database.c @@ -688,6 +688,9 @@ int apk_db_open(struct apk_database *db, const char *root, unsigned int flags) } fchdir(db->root_fd); + if (stat(apk_linked_cache_dir, &st) == 0 && S_ISDIR(st.st_mode)) + db->cache_dir = apk_linked_cache_dir; + if (flags & APK_OPENF_WRITE) { db->lock_fd = open("var/lib/apk/lock", O_CREAT | O_WRONLY, 0400); @@ -753,9 +756,6 @@ int apk_db_open(struct apk_database *db, const char *root, unsigned int flags) free(blob.ptr); } } - - if (stat(apk_linked_cache_dir, &st) == 0 && S_ISDIR(st.st_mode)) - db->cache_dir = apk_linked_cache_dir; } if (!(flags & APK_OPENF_NO_REPOS)) {