almalinux/pungi
14
1
Fork 0
Code Issues Pull Requests Releases Activity

don't include s390 packages when composing s390x image

Browse Source 
Signed-off-by: Dan Horák <dan@danny.cz>
This commit is contained in:
Dennis Gilmore 2012-04-16 15:54:08 -05:00
parent cd1ec8f6ed
commit 989462bf86
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/pypungi/__init__.py
View File

@ -242,9 +242,9 @@ class Pungi(pypungi.PungiBase):
self.ayum.arch.setup_arch(yumarch) self.ayum.arch.setup_arch(yumarch)
self.ayum.compatarch = yumarch self.ayum.compatarch = yumarch
# Filter out all the multilib arches, anaconda won't use them. # 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)) 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_archinfo = yum.rpmUtils.arch.getMultiArchInfo(yumarch)
compat_archlist = set(yum.rpmUtils.arch.getArchList(compat_archinfo[0])) compat_archlist = set(yum.rpmUtils.arch.getArchList(compat_archinfo[0]))
newarchlist = list(full_archlist.difference(compat_archlist)) newarchlist = list(full_archlist.difference(compat_archlist))