From: Michael Tremer <michael.tremer@ipfire.org>
Date: Fri, 30 Jul 2021 15:40:13 +0000 (+0000)
Subject: pakfire: Initialize keystore when pakfire is being initialized
X-Git-Tag: 0.9.28~1010
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0f053118e2c9490223edb6fdc3d1302abc70504c;p=pakfire.git

pakfire: Initialize keystore when pakfire is being initialized

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

diff --git a/src/libpakfire/pakfire.c b/src/libpakfire/pakfire.c
index 44cf7b918..85e8d7911 100644
--- a/src/libpakfire/pakfire.c
+++ b/src/libpakfire/pakfire.c
@@ -951,6 +951,11 @@ PAKFIRE_EXPORT int pakfire_create(struct pakfire** pakfire, const char* path,
 		goto ERROR;
 	}
 
+	// Initialize keystore
+	r = pakfire_keystore_init(p, &p->gpgctx);
+	if (r)
+		goto ERROR;
+
 	// Populate pool
 	r = pakfire_populate_pool(p);
 	if (r)
@@ -1066,15 +1071,6 @@ PAKFIRE_EXPORT int pakfire_bind(struct pakfire* pakfire, const char* src, const
 }
 
 gpgme_ctx_t pakfire_get_gpgctx(struct pakfire* pakfire) {
-	// Create a new context if not done, yet
-	if (!pakfire->gpgctx) {
-		int r = pakfire_keystore_init(pakfire, &pakfire->gpgctx);
-		if (r) {
-			ERROR(pakfire, "Could not initialize keystore: %m\n");
-			return NULL;
-		}
-	}
-
 	return pakfire->gpgctx;
 }