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

Expand compatible arches when gathering from modules.

Browse Source 
Fixes #596.

Signed-off-by: Ralph Bean <rbean@redhat.com>
This commit is contained in:
Ralph Bean 2017-04-12 14:31:40 -04:00
parent dcc1750df2
commit 01607602c6
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pungi/phases/gather/sources/source_module.py
View File

@ -19,7 +19,7 @@ Get a package list based on modulemd metadata loaded in pkgset phase.
""" """
from pungi.wrappers.comps import CompsWrapper import pungi.arch
import pungi.phases.gather.source import pungi.phases.gather.source
import kobo.rpmlib import kobo.rpmlib
@ -31,9 +31,13 @@ class GatherSourceModule(pungi.phases.gather.source.GatherSourceBase):
groups = set() groups = set()
packages = set() packages = set()
compatible_arches = pungi.arch.get_compatible_arches(arch)
if variant is not None and variant.modules: if variant is not None and variant.modules:
rpms = variant.pkgset.rpms_by_arch[arch] + \ rpms = sum([
variant.pkgset.rpms_by_arch["noarch"] variant.pkgset.rpms_by_arch.get(a, [])
for a in compatible_arches
], [])
for rpm_obj in rpms: for rpm_obj in rpms:
for mmd in variant.mmds: for mmd in variant.mmds:
srpm = kobo.rpmlib.parse_nvr(rpm_obj.sourcerpm)["name"] srpm = kobo.rpmlib.parse_nvr(rpm_obj.sourcerpm)["name"]