From 2f02ddf16d3a72f468ed12c322aa214eb6c03a4b Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Tue, 3 Jul 2018 09:55:22 +1200 Subject: [PATCH] utils: fix missing dependency logic in _add_dependency() * If a missing dependency is not required, show a warning instead of an error * If logger isn't specified we still need to skip to the next item, so move the continue statement out of the conditional block. (In practice I don't think this function is currently called anywhere in the code without a logger specified, but let's fix it anyway). Signed-off-by: Paul Eggleton --- layerindex/utils.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/layerindex/utils.py b/layerindex/utils.py index 3dc54a1..861a841 100644 --- a/layerindex/utils.py +++ b/layerindex/utils.py @@ -140,8 +140,11 @@ def _add_dependency(var, name, layerbranch, config_data, logger=None, required=T # No layer found. if not dep_layer: if logger: - logger.error('Cannot resolve %s %s (version %s) for %s' % (name, dep, ver_str, layer_name)) - continue + if required: + logger.error('Cannot resolve %s %s (version %s) for %s' % (name, dep, ver_str, layer_name)) + else: + logger.warning('Cannot resolve %s %s (version %s) for %s' % (name, dep, ver_str, layer_name)) + continue # Preparing to remove obsolete ones if need_remove: