From 989462bf8628473917f2162bf7e887689bb2a381 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Mon, 16 Apr 2012 15:54:08 -0500 Subject: [PATCH] don't include s390 packages when composing s390x image MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Dan Horák --- src/pypungi/__init__.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pypungi/__init__.py b/src/pypungi/__init__.py index 09b4ee96..059b7481 100644 --- a/src/pypungi/__init__.py +++ b/src/pypungi/__init__.py @@ -242,9 +242,9 @@ class Pungi(pypungi.PungiBase): self.ayum.arch.setup_arch(yumarch) self.ayum.compatarch = yumarch # Filter out all the multilib arches, anaconda won't use them. - # only makes sense on x86_64 + # only makes sense on x86_64 and s390x full_archlist = set(yum.rpmUtils.arch.getArchList(yumarch)) - if arch == 'x86_64' and not self.config.getboolean('pungi', 'full_archlist'): + if arch in ['x86_64', 's390x'] and not self.config.getboolean('pungi', 'full_archlist'): compat_archinfo = yum.rpmUtils.arch.getMultiArchInfo(yumarch) compat_archlist = set(yum.rpmUtils.arch.getArchList(compat_archinfo[0])) newarchlist = list(full_archlist.difference(compat_archlist))