From 5ed0266ae2111e84d7619b314ddfd822870b648f Mon Sep 17 00:00:00 2001 From: =?utf8?q?Neal=20Gompa=20=28=E3=83=8B=E3=83=BC=E3=83=AB=E3=83=BB?= =?utf8?q?=E3=82=B3=E3=82=99=E3=83=B3=E3=83=8F=E3=82=9A=29?= Date: Fri, 2 Oct 2015 09:33:02 -0400 Subject: [PATCH] Turn on Fedora-specific behaviors in libsolv for Mageia for DNF Consistent with work to enable DNF for Mageia as an alternate repository manager, definitions expected by hawkey from libsolv need to be set for the MAGEIA definition as well. For more information on the work to enable DNF for Mageia, see https://wiki.mageia.org/en/Feature:Add_DNF_as_Alternate_Repository_Manager --- src/pool.c | 2 +- src/poolarch.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/pool.c b/src/pool.c index 33293b5b..85932bf1 100644 --- a/src/pool.c +++ b/src/pool.c @@ -82,7 +82,7 @@ pool_create(void) s->evr = ID_EMPTY; pool->debugmask = SOLV_DEBUG_RESULT; /* FIXME */ -#ifdef FEDORA +#if defined(FEDORA) || defined(MAGEIA) pool->implicitobsoleteusescolors = 1; #endif #ifdef RPM5 diff --git a/src/poolarch.c b/src/poolarch.c index 9408983f..788646b1 100644 --- a/src/poolarch.c +++ b/src/poolarch.c @@ -21,7 +21,7 @@ #include "util.h" static const char *archpolicies[] = { -#ifdef FEDORA +#if defined(FEDORA) || defined(MAGEIA) "x86_64", "x86_64:athlon:i686:i586:i486:i386", #else "x86_64", "x86_64:i686:i586:i486:i386", @@ -64,7 +64,7 @@ static const char *archpolicies[] = { "mips64", "mips64", "mips64el", "mips64el", "m68k", "m68k", -#ifdef FEDORA +#if defined(FEDORA) || defined(MAGEIA) "ia32e", "ia32e:x86_64:athlon:i686:i586:i486:i386", "athlon", "athlon:i686:i586:i486:i386", "amd64", "amd64:x86_64:athlon:i686:i586:i486:i386", -- 2.47.2