[yum-commits] Branch 'yum-3_2_X' - 2 commits - rpmUtils/arch.py yum.spec

[James Antill]

 rpmUtils/arch.py |    8 ++++++--
 yum.spec         |    2 +-
 2 files changed, 7 insertions(+), 3 deletions(-)

New commits:
commit 96a63807a59d9d0ab988e9958d17004c7a94a6ef
Author: James Antill <james at and.org>
Date:   Tue Jun 28 17:00:05 2011 -0400

    Add the ppc => ppc64 change, but keep the old default upstream atm. BZ 713791.

diff --git a/rpmUtils/arch.py b/rpmUtils/arch.py
index 6082005..ad7bbb1 100644
--- a/rpmUtils/arch.py
+++ b/rpmUtils/arch.py
@@ -3,6 +3,8 @@
 
 import os
 
+_ppc64_native_is_best = False
+
 # dict mapping arch -> ( multicompat, best personality, biarch personality )
 multilibArches = { "x86_64":  ( "athlon", "x86_64", "athlon" ),
                    "sparc64v": ( "sparcv9v", "sparcv9v", "sparc64v" ),
@@ -10,6 +12,8 @@ multilibArches = { "x86_64":  ( "athlon", "x86_64", "athlon" ),
                    "ppc64":   ( "ppc", "ppc", "ppc64" ),
                    "s390x":   ( "s390", "s390x", "s390" ),
                    }
+if _ppc64_native_is_best:
+    multilibArches["ppc64"] = ( "ppc", "ppc64", "ppc64" )
 
 arches = {
     # ia32
@@ -339,7 +343,7 @@ def getBestArch(myarch=None):
     if arch.startswith("sparc64"):
         arch = multilibArches[arch][1]
 
-    if arch.startswith("ppc64"):
+    if arch.startswith("ppc64") and not _ppc64_native_is_best:
         arch = 'ppc'
 
     return arch
@@ -357,7 +361,7 @@ def getBaseArch(myarch=None):
 
     if myarch.startswith("sparc64"):
         return "sparc"
-    elif myarch.startswith("ppc64"):
+    elif myarch.startswith("ppc64") and not _ppc64_native_is_best:
         return "ppc"
     elif myarch.startswith("arm"):
         return "arm"
commit e7079fcde30f915ce89fb021648d7da15af5af37
Author: James Antill <james at and.org>
Date:   Tue Jun 28 16:27:17 2011 -0400

    Update yum.spec version too.

diff --git a/yum.spec b/yum.spec
index abd203f..9e7ed43 100644
--- a/yum.spec
+++ b/yum.spec
@@ -1,6 +1,6 @@
 Summary: RPM installer/updater
 Name: yum
-Version: 3.4.2
+Version: 3.4.3
 Release: 0
 License: GPLv2+
 Group: System Environment/Base