From: Neal Gompa <ngompa13@gmail.com>
Date: Sun, 6 Aug 2017 04:17:15 +0000 (-0400)
Subject: Switch solv to read rpm-md repos on Mageia
X-Git-Tag: 0.6.29~5^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F219%2Fhead;p=thirdparty%2Flibsolv.git

Switch solv to read rpm-md repos on Mageia

Mageia is using libsolv with DNF and RPM-MD repositories, thus
the solv tool should be using our RPM-MD repository configuration.
---

diff --git a/examples/solv/repoinfo.c b/examples/solv/repoinfo.c
index 91f7c289..62739728 100644
--- a/examples/solv/repoinfo.c
+++ b/examples/solv/repoinfo.c
@@ -18,13 +18,13 @@
 #include "repoinfo.h"
 #include "repoinfo_cache.h"
 
-#if defined(SUSE) || defined(FEDORA)
+#if defined(SUSE) || defined(FEDORA) || defined(MAGEIA)
 #include "repoinfo_config_yum.h"
 #endif
 #if defined(DEBIAN)
 #include "repoinfo_config_debian.h"
 #endif
-#if defined(MANDRIVA) || defined(MAGEIA)
+#if defined(MANDRIVA)
 #include "repoinfo_config_urpmi.h"
 #endif
 
@@ -80,7 +80,7 @@ free_repoinfos(struct repoinfo *repoinfos, int nrepoinfos)
       solv_free(cinfo->components);
     }
   solv_free(repoinfos);
-#if defined(SUSE) || defined(FEDORA)
+#if defined(SUSE) || defined(FEDORA) || defined(MAGEIA)
   yum_substitute((Pool *)0, 0);		/* free data */
 #endif
 }
@@ -89,10 +89,10 @@ struct repoinfo *
 read_repoinfos(Pool *pool, int *nrepoinfosp)
 {
   struct repoinfo *repoinfos = 0;
-#if defined(SUSE) || defined(FEDORA)
+#if defined(SUSE) || defined(FEDORA) || defined(MAGEIA)
   repoinfos = read_repoinfos_yum(pool, nrepoinfosp);
 #endif
-#if defined(MANDRIVA) || defined(MAGEIA)
+#if defined(MANDRIVA)
   repoinfos = read_repoinfos_urpmi(pool, nrepoinfosp);
 #endif
 #if defined(DEBIAN)