From 38810b3f13861aa36f832d9e8f7ac14276d181a1 Mon Sep 17 00:00:00 2001 From: Petr Písař Date: Feb 04 2022 10:15:31 +0000 Subject: modules: Correct a typo in loading obsoletes Pungi failed: TypeError: argument obsoletes: Expected Modulemd.Obsoletes, but got list Frame collect_module_obsoletes in /usr/lib/python3.10/site-packages/pungi/module_util.py at line 91 84 mod_index = mod_index or Modulemd.ModuleIndex() 85 86 for module_name, obsoletes in iter_module_defaults_or_obsoletes( 87 obsoletes_dir, obsoletes=True 88 ): 89 for obsolete in obsoletes: 90 if not modules_to_load or module_name in modules_to_load: --> 91 mod_index.add_obsoletes(obsoletes) 92 93 return mod_index mod_index = module_name = 'perl' modules_to_load = {'perl-Date-Manip', 'subversion', 'sway', 'nginx', 'perl-YAML', 'ghc', 'perl-App-cpanminus', 'perl-XML-Parser', 'varnish', 'nodejs', 'cri-o', 'perl-DBD-Pg', 'perl-DBI', 'perl', 'swig', 'perl-FCGI', 'p obsolete = obsoletes = [] obsoletes_dir = '/mnt/koji/compose/rawhide/Fedora-Rawhide-20220203.n.1/work/global/module_obsoletes' This patches fixes the typo in add_obsoletes() argument. https://pagure.io/releng/failed-composes/issue/3058 Signed-off-by: Petr Písař --- diff --git a/pungi/module_util.py b/pungi/module_util.py index 94a0ec5..a25cb36 100644 --- a/pungi/module_util.py +++ b/pungi/module_util.py @@ -88,6 +88,6 @@ def collect_module_obsoletes(obsoletes_dir, modules_to_load, mod_index=None): ): for obsolete in obsoletes: if not modules_to_load or module_name in modules_to_load: - mod_index.add_obsoletes(obsoletes) + mod_index.add_obsoletes(obsolete) return mod_index