From: Michael Tremer <michael.tremer@ipfire.org>
Date: Tue, 19 Jan 2021 20:27:49 +0000 (+0000)
Subject: libpakfire: db: Assume that the private directory already exists
X-Git-Tag: 0.9.28~1285^2~839
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0cb487ffae82112c9dbebeb8c102799602463b04;p=pakfire.git

libpakfire: db: Assume that the private directory already exists

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/src/libpakfire/db.c b/src/libpakfire/db.c
index 865ef6463..e18f15ef3 100644
--- a/src/libpakfire/db.c
+++ b/src/libpakfire/db.c
@@ -29,6 +29,8 @@
 #include <pakfire/types.h>
 #include <pakfire/util.h>
 
+#define DATABASE_PATH PAKFIRE_PRIVATE_DIR "/packages.db"
+
 struct pakfire_db {
 	Pakfire pakfire;
 	int nrefs;
@@ -49,14 +51,11 @@ int pakfire_db_env_init(Pakfire pakfire, MDB_env** env) {
 		return r;
 	}
 
-	const char* root = pakfire_get_path(pakfire);
-	char* path = pakfire_path_join(root, "var/lib/pakfire/database.db");
-
-	// Ensure the directory exists
-	pakfire_mkdir(pakfire, path, 0);
+	// The database path
+	char* path = pakfire_make_path(pakfire, DATABASE_PATH);
 
 	// Open the database environment
-	r = mdb_env_open(*env, path, 0, 0660);
+	r = mdb_env_open(*env, path, MDB_NOSUBDIR, 0660);
 	if (r) {
 		switch (r) {
 			case MDB_VERSION_MISMATCH: