From: Michael Schroeder <mls@suse.de>
Date: Tue, 30 Jan 2018 09:20:26 +0000 (+0100)
Subject: Fix _dbpath macro definition
X-Git-Tag: 0.6.31~10
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=890e85ab1f428ae4203d5b7691fff70e3eec4006;p=thirdparty%2Flibsolv.git

Fix _dbpath macro definition

The rootdir must come after _dbpath...
---

diff --git a/ext/repo_rpmdb.c b/ext/repo_rpmdb.c
index f12339b2..57205d31 100644
--- a/ext/repo_rpmdb.c
+++ b/ext/repo_rpmdb.c
@@ -1731,7 +1731,7 @@ opendbenv(struct rpmdbstate *state)
   const char *rootdir = state->rootdir;
   rpmts ts;
   char *dbpath;
-  dbpath = solv_dupjoin(rootdir, "_dbpath /var/lib/rpm", 0);
+  dbpath = solv_dupjoin("_dbpath ", rootdir, "/var/lib/rpm");
   if (access(dbpath + 8, W_OK) == -1)
     {
       free(dbpath);
@@ -1739,7 +1739,7 @@ opendbenv(struct rpmdbstate *state)
       if (access(dbpath, R_OK) == 0)
 	state->is_ostree = 1;
       free(dbpath);
-      dbpath = solv_dupjoin(rootdir, state->is_ostree ? "_dbpath /usr/share/rpm" : "_dbpath /var/lib/rpm", 0);
+      dbpath = solv_dupjoin("_dbpath ", rootdir, state->is_ostree ? "/usr/share/rpm" : "/var/lib/rpm");
     }
   rpmDefineMacro(NULL, dbpath, 0);
   ts = rpmtsCreate();