diff options
author | Bill Nottingham <notting@redhat.com> | 2009-07-06 15:46:01 -0400 |
---|---|---|
committer | Bill Nottingham <notting@redhat.com> | 2009-07-07 11:24:39 -0400 |
commit | a8e54641fbb1efc4d2b776da817dafa2a189d0a1 (patch) | |
tree | 158bc679e5ca30c8947cf7222907dd48e04110b1 | |
parent | 1aa67d5a2cdacd45f92ba15aa9392ba7191a49c7 (diff) | |
download | anaconda-a8e54641fbb1efc4d2b776da817dafa2a189d0a1.tar.gz anaconda-a8e54641fbb1efc4d2b776da817dafa2a189d0a1.tar.xz anaconda-a8e54641fbb1efc4d2b776da817dafa2a189d0a1.zip |
Clean up some arch code.
Just use rpmUtils's definition of multilib arches, and we no longer
set ppc64iseries/ppc64pseries.
-rw-r--r-- | yuminstall.py | 5 |
1 files changed, 2 insertions, 3 deletions
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 |