Attachment 153523 Details for Bug 233427 – patch

[patch] patch

yum-3.1.6-arch-ordering.patch (text/plain), 1.07 KB, created by David Woodhouse on 2007-04-26 15:36:45 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: David Woodhouse

Created: 2007-04-26 15:36:45 UTC

Size: 1.07 KB

patch

obsolete

>--- yum-3.1.6/rpmUtils/arch.py.orig	2007-03-19 20:32:34.000000000 +0000
>+++ yum-3.1.6/rpmUtils/arch.py	2007-04-26 16:33:28.000000000 +0100
>@@ -95,6 +95,12 @@ def getBestArchFromList(archlist, myarch
> 
>     if len(archlist) == 0:
>         return None
>+
>+    bestarch = getBestArch(myarch)
>+    if bestarch != myarch:
>+        bestarchchoice = getBestArchFromList(archlist, bestarch);
>+        if bestarchchoice != None and bestarchchoice != "noarch":
>+            return bestarchchoice;
>     
>     thisarch = archlist[0]
>     for arch in archlist[1:]:
>@@ -261,11 +267,14 @@ def getMultiArchInfo(arch = canonArch):
> # get the best usual userspace arch for the arch we're on.  this is
> # our arch unless we're on an arch that uses the secondary as its
> # userspace (eg ppc64, sparc64)
>-def getBestArch():
>-    arch = canonArch
>+def getBestArch(myarch=None):
>+    if myarch:
>+        arch = myarch
>+    else:
>+        arch = canonArch
> 
>     if arch.startswith("sparc64"):
>-        arch = "sparc"
>+        arch = multilibArches[arch][1]
> 
>     if arch.startswith("ppc64"):
>         arch = "ppc"

Actions: View | Diff

Attachments on bug 233427: 150771 | 153486 | 153523