From: Richard Purdie <richard.purdie@linuxfoundation.org>
Date: Tue, 14 Aug 2012 08:28:00 +0000 (+0100)
Subject: rpmresolve: Ensure we call the rpm relocation code at init
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8b8748c8f963900b83dc0fdd7757556f917fe4fd;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

rpmresolve: Ensure we call the rpm relocation code at init

We need to call rpmcliInit to ensure the rpm relocation code is called
and it correctly honours the relocation environmental variables.

We can drop the ReadConfigFiles call since the cliInit does this for us.

(From OE-Core rev: eb17fdc1461953382360635480f12357eac4dc43)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/meta/recipes-devtools/rpm/rpmresolve/rpmresolve.c b/meta/recipes-devtools/rpm/rpmresolve/rpmresolve.c
index 2d9ed141f4b..568b6891f4c 100644
--- a/meta/recipes-devtools/rpm/rpmresolve/rpmresolve.c
+++ b/meta/recipes-devtools/rpm/rpmresolve/rpmresolve.c
@@ -343,9 +343,10 @@ int main(int argc, char **argv)
 
     const char *dblistfn = argv[optind];
 
+    rpmcliInit(argc, argv, NULL);
+
     //rpmSetVerbosity(RPMLOG_DEBUG);
 
-    rpmReadConfigFiles( NULL, NULL );
     rpmDefineMacro(NULL, "__dbi_txn create nofsync", RMIL_CMDLINE);
 
     rc = loadTs(&ts, &tscount, dblistfn);