From a8e54641fbb1efc4d2b776da817dafa2a189d0a1 Mon Sep 17 00:00:00 2001
From: Bill Nottingham <notting@redhat.com>
Date: Mon, 6 Jul 2009 15:46:01 -0400
Subject: Clean up some arch code.

Just use rpmUtils's definition of multilib arches, and we no longer
set ppc64iseries/ppc64pseries.
---
 yuminstall.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'yuminstall.py')

diff --git a/yuminstall.py b/yuminstall.py
index d96dae665..5fdca805b 100644
--- a/yuminstall.py
+++ b/yuminstall.py
@@ -762,8 +762,7 @@ class AnacondaYum(YumSorter):
         return (downloadpkgs, totalSize, totalFiles)
 
     def setColor(self):
-        if (rpmUtils.arch.canonArch.startswith("ppc64") or
-        rpmUtils.arch.canonArch in ("s390x", "sparc64", "x86_64", "ia64")):
+        if rpmUtils.arch.isMultiLibArch():
             self.ts.ts.setColor(3)
 
     def run(self, instLog, cb, intf, id):
@@ -1285,7 +1284,7 @@ reposdir=/etc/anaconda.repos.d,/tmp/updates/anaconda.repos.d,/tmp/product/anacon
 
         foundkernel = False
 
-        if (isys.smpAvailable() or isys.htavailable()) and not rpmUtils.arch.canonArch.startswith("ppc64"):
+        if (isys.smpAvailable() or isys.htavailable()) and rpmUtils.arch.canonArch != "ppc64":
             if selectKernel("kernel-smp"):
                 foundkernel = True
 
-- 
cgit