From: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed, 24 Mar 2021 14:04:49 +0000 (+0000)
Subject: dist: Read macros from /
X-Git-Tag: 0.9.28~1285^2~473
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=542cb0d4ff0a412e570115d9e5891fcaf97b626c;p=pakfire.git

dist: Read macros from /

The Pakfire instance might not be populated

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

diff --git a/src/libpakfire/dist.c b/src/libpakfire/dist.c
index 9e5e9f6dd..49b55afb2 100644
--- a/src/libpakfire/dist.c
+++ b/src/libpakfire/dist.c
@@ -54,15 +54,11 @@ PAKFIRE_EXPORT int pakfire_read_makefile(PakfireParser* parser, Pakfire pakfire,
 	// XXX set defaults
 
 	// Find all macros
-	char* macros = pakfire_make_path(pakfire, PAKFIRE_MACROS_GLOB_PATTERN);
-	if (!macros)
-		goto ERROR;
 
-	DEBUG(pakfire, "Searching for macros in %s\n", macros);
+	DEBUG(pakfire, "Searching for macros in %s\n", PAKFIRE_MACROS_GLOB_PATTERN);
 
 	glob_t globmacros;
-	r = glob(macros, 0, NULL, &globmacros);
-	free(macros);
+	r = glob(PAKFIRE_MACROS_GLOB_PATTERN, 0, NULL, &globmacros);
 
 	// Handle any errors
 	switch (r) {