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

Update from upstream #11

Closed
soksanichenko wants to merge 158 commits from a8_updated into a8
pull from: a8_updated
merge into: almalinux:a8
Conversation 0 Commits 158 Files Changed 128 +4 -2
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 33d7290d78 - Show all commits

6
pungi/phases/gather/sources/source_json.py
View File

@ -48,12 +48,14 @@ class GatherSourceJson(pungi.phases.gather.source.GatherSourceBase):
if variant is None: if variant is None:
# get all packages for all variants # get all packages for all variants
for variant_uid in mapping: for variant_uid in mapping:
for pkg_name, pkg_arches in mapping[variant_uid][arch].items(): for pkg_name, pkg_arches in mapping[variant_uid].get(arch, {}).items():
for pkg_arch in pkg_arches: for pkg_arch in pkg_arches:
packages.add((pkg_name, pkg_arch)) packages.add((pkg_name, pkg_arch))
else: else:
# get packages for a particular variant # get packages for a particular variant
for pkg_name, pkg_arches in mapping[variant.uid][arch].items(): for pkg_name, pkg_arches in (
mapping.get(variant.uid, {}).get(arch, {}).items()
):
for pkg_arch in pkg_arches: for pkg_arch in pkg_arches:
packages.add((pkg_name, pkg_arch)) packages.add((pkg_name, pkg_arch))
return packages, set() return packages, set()