Just use rpmUtils's definition of multilib arches, and we no longer set ppc64iseries/ppc64pseries.
Signed-off-by: Bill Nottingham notting@redhat.com --- yuminstall.py | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/yuminstall.py b/yuminstall.py index 70ed98a..acc2fba 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
anaconda-devel@lists.fedoraproject.org