Attachment 7081 Details for Bug 16878 – Enables "Fedora"-specific behaviors to ensure hawkey operates properly

[patch] Enables "Fedora"-specific behaviors to ensure hawkey operates properly

file_16878.txt (text/plain), 1.70 KB, created by Neal Gompa on 2015-10-02 16:28:18 CEST

(hide)

Description:

Filename:

MIME Type:

Creator: Neal Gompa

Created: 2015-10-02 16:28:18 CEST

Size: 1.70 KB

patch

obsolete

>From 638d4432db2236a3e165fb9f1fa5d6f98febea76 Mon Sep 17 00:00:00 2001
>From: Neal Gompa (ãã¼ã«ã»ã´ã³ã) <ngompa13@gmail.com>
>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 33293b5..3cd270c 100644
>--- src/pool.c
>+++ 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 9408983..0fee0a4 100644
>--- src/poolarch.c
>+++ 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.3.8

From 638d4432db2236a3e165fb9f1fa5d6f98febea76 Mon Sep 17 00:00:00 2001
From: Neal Gompa (ãã¼ã«ã»ã´ã³ã) <ngompa13@gmail.com>
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 33293b5..3cd270c 100644
--- src/pool.c
+++ 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 9408983..0fee0a4 100644
--- src/poolarch.c
+++ 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.3.8

Actions: View | Diff

Attachments on bug 16878: 7081