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

Merge #578 Save modules metadata as full yaml object and query only active modules from PDC

Browse Source
This commit is contained in:
Lubomír Sedlář 2017-03-27 13:33:30 +00:00
commit d0974d5c6a
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pungi/phases/createrepo.py
View File

@ -186,7 +186,7 @@ def create_variant_repo(compose, arch, variant, pkg_type):
import yaml import yaml
modules = {"modules": []} modules = {"modules": []}
for mmd in variant.mmds: for mmd in variant.mmds:
modules["modules"].append(mmd.dumps()) modules["modules"].append(yaml.safe_load(mmd.dumps()))
tmp_dir = compose.mkdtemp(prefix="pungi_") tmp_dir = compose.mkdtemp(prefix="pungi_")
modules_path = os.path.join(tmp_dir, "modules.yaml") modules_path = os.path.join(tmp_dir, "modules.yaml")
with open(modules_path, "w") as outfile: with open(modules_path, "w") as outfile:

1
pungi/phases/pkgset/sources/source_koji.py
View File

@ -77,6 +77,7 @@ def get_module(session, module_info, strict=False):
query = dict( query = dict(
variant_id=module_info['variant_id'], variant_id=module_info['variant_id'],
variant_version=module_info['variant_version'], variant_version=module_info['variant_version'],
active=True,
) )
if module_info.get('variant_release'): if module_info.get('variant_release'):
query['variant_release'] = module_info['variant_release'] query['variant_release'] = module_info['variant_release']