only filter the arch list on x86_64 we cant do it on sparc and ppc.
it really only makes sense on x86_64.
This commit is contained in:
parent
4bc181ed4a
commit
4002565f53
@ -177,16 +177,17 @@ class Pungi(pypungi.PungiBase):
|
|||||||
|
|
||||||
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
|
||||||
full_archlist = set(yum.rpmUtils.arch.getArchList(yumarch))
|
full_archlist = set(yum.rpmUtils.arch.getArchList(yumarch))
|
||||||
|
if arch == 'x86_64':
|
||||||
compat_archinfo = yum.rpmUtils.arch.getMultiArchInfo(yumarch)
|
compat_archinfo = yum.rpmUtils.arch.getMultiArchInfo(yumarch)
|
||||||
if not compat_archinfo:
|
|
||||||
arches = list(full_archlist)
|
|
||||||
else:
|
|
||||||
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))
|
||||||
if 'noarch' not in newarchlist:
|
if 'noarch' not in newarchlist:
|
||||||
newarchlist.append('noarch')
|
newarchlist.append('noarch')
|
||||||
arches = newarchlist
|
arches = newarchlist
|
||||||
|
else:
|
||||||
|
arches = list(full_archlist)
|
||||||
|
|
||||||
arches.append('src') # throw source in there, filter it later
|
arches.append('src') # throw source in there, filter it later
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user