From 4002565f530269f54b0d669d5e678d0fff1a2bd3 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Mon, 11 Apr 2011 14:03:01 -0500 Subject: [PATCH] only filter the arch list on x86_64 we cant do it on sparc and ppc. it really only makes sense on x86_64. --- src/pypungi/__init__.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/pypungi/__init__.py b/src/pypungi/__init__.py index 506c848a..1c9c1a00 100644 --- a/src/pypungi/__init__.py +++ b/src/pypungi/__init__.py @@ -177,16 +177,17 @@ class Pungi(pypungi.PungiBase): self.ayum.compatarch = yumarch # Filter out all the multilib arches, anaconda won't use them. + # only makes sense on x86_64 full_archlist = set(yum.rpmUtils.arch.getArchList(yumarch)) - compat_archinfo = yum.rpmUtils.arch.getMultiArchInfo(yumarch) - if not compat_archinfo: - arches = list(full_archlist) - else: + if arch == 'x86_64': + compat_archinfo = yum.rpmUtils.arch.getMultiArchInfo(yumarch) compat_archlist = set(yum.rpmUtils.arch.getArchList(compat_archinfo[0])) newarchlist = list(full_archlist.difference(compat_archlist)) if 'noarch' not in newarchlist: newarchlist.append('noarch') arches = newarchlist + else: + arches = list(full_archlist) arches.append('src') # throw source in there, filter it later