From ca754903ac659d8d32ad3422accb46cc7ff44a18 Mon Sep 17 00:00:00 2001 From: Jan Kaluza Date: Wed, 11 Jan 2017 09:54:45 +0100 Subject: [PATCH] Fail in resolve_profiles in case dependency cannot be found in PDC --- module_build_service/pdc.py | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/module_build_service/pdc.py b/module_build_service/pdc.py index 6b4f0d5d..4d7142b9 100644 --- a/module_build_service/pdc.py +++ b/module_build_service/pdc.py @@ -226,21 +226,13 @@ def resolve_profiles(session, mmd, keys, seen=None): continue # Find the latest of the dep in our db of built modules. - module_info = {} - module_info['variant_id'] = name - module_info['variant_stream'] = stream - dep_mmd = get_module_modulemd(session, module_info, False) - # XXX - We may want to make this fatal one day, but warn for now. - if not dep_mmd: - log.warn("Could not find built dep " - "%s/%s for %r" % (name, stream, mmd.name)) - continue + module_info = {'variant_id': name, 'variant_stream': stream} + dep_mmd = get_module_modulemd(session, module_info, True) # Take note of what rpms are in this dep's profile. - profiles = dep_mmd.profiles for key in keys: - if key in profiles: - results[key] |= profiles[key].rpms + if key in dep_mmd.profiles: + results[key] |= dep_mmd.profiles[key].rpms # And recurse to all modules that are deps of our dep. rec_results = resolve_profiles(session, dep_mmd, keys, seen + [name])