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

Make strict the only option.

Browse Source 
Signed-off-by: Ralph Bean <rbean@redhat.com>
This commit is contained in:
Ralph Bean 2017-08-07 08:44:38 -04:00 committed by Lubomír Sedlář
parent 58fe997e29
commit 381d08a810
1 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -83,12 +83,10 @@ def variant_dict_from_str(module_str):
@retry(wait_on=IOError) @retry(wait_on=IOError)
def get_module(session, module_info, strict=False): def get_module(session, module_info):
""" """
:param session : PDCClient instance :param session : PDCClient instance
:param module_info: pdc variant_dict, str, mmd or module dict :param module_info: pdc variant_dict, str, mmd or module dict
:param strict: Normally this function returns None if no module can be
found. If strict=True, then a ValueError is raised.
:return final list of module_info which pass repoclosure :return final list of module_info which pass repoclosure
""" """
@ -105,12 +103,9 @@ def get_module(session, module_info, strict=False):
retval = session['unreleasedvariants'](page_size=-1, **query) retval = session['unreleasedvariants'](page_size=-1, **query)
# Error handling # Error reporting
if not retval: if not retval:
if strict: raise ValueError("Failed to find module in PDC %r" % query)
raise ValueError("Failed to find module in PDC %r" % query)
else:
return None
module = None module = None
# If we specify 'variant_release', we expect only single module to be # If we specify 'variant_release', we expect only single module to be
@ -179,7 +174,7 @@ def populate_global_pkgset(compose, koji_wrapper, path_prefix, event_id):
# to compose_tags list. # to compose_tags list.
if session: if session:
for module in variant.get_modules(): for module in variant.get_modules():
pdc_module = get_module(session, module["name"], strict=True) pdc_module = get_module(session, module["name"])
mmd = modulemd.ModuleMetadata() mmd = modulemd.ModuleMetadata()
mmd.loads(pdc_module["modulemd"]) mmd.loads(pdc_module["modulemd"])