From 1575ed28ea0ab8e49f08b098fb327497e4559aeb Mon Sep 17 00:00:00 2001 From: Jan Kaluza Date: Mon, 27 Mar 2017 15:28:18 +0200 Subject: [PATCH 1/2] Save modules metadata as full yaml object Signed-off-by: Jan Kaluza --- pungi/phases/createrepo.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pungi/phases/createrepo.py b/pungi/phases/createrepo.py index 9d580363..6468229c 100644 --- a/pungi/phases/createrepo.py +++ b/pungi/phases/createrepo.py @@ -186,7 +186,7 @@ def create_variant_repo(compose, arch, variant, pkg_type): import yaml modules = {"modules": []} for mmd in variant.mmds: - modules["modules"].append(mmd.dumps()) + modules["modules"].append(yaml.safe_load(mmd.dumps())) tmp_dir = compose.mkdtemp(prefix="pungi_") modules_path = os.path.join(tmp_dir, "modules.yaml") with open(modules_path, "w") as outfile: From be9a63c42f51c2c24fe38a3d4dedd9e7387a57b3 Mon Sep 17 00:00:00 2001 From: Jan Kaluza Date: Mon, 27 Mar 2017 15:29:59 +0200 Subject: [PATCH 2/2] Query only active modules in PDC. Signed-off-by: Jan Kaluza --- pungi/phases/pkgset/sources/source_koji.py | 1 + 1 file changed, 1 insertion(+) diff --git a/pungi/phases/pkgset/sources/source_koji.py b/pungi/phases/pkgset/sources/source_koji.py index 15d7d88d..8f275ad3 100644 --- a/pungi/phases/pkgset/sources/source_koji.py +++ b/pungi/phases/pkgset/sources/source_koji.py @@ -77,6 +77,7 @@ def get_module(session, module_info, strict=False): query = dict( variant_id=module_info['variant_id'], variant_version=module_info['variant_version'], + active=True, ) if module_info.get('variant_release'): query['variant_release'] = module_info['variant_release']