[yocto] [layerindex-web][PATCH 6/7] utils: fix missing dependency logic in _add_dependency()
Paul Eggleton
paul.eggleton at linux.intel.com
Mon Jul 2 15:58:50 PDT 2018
* 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 <paul.eggleton at linux.intel.com>
---
layerindex/utils.py | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/layerindex/utils.py b/layerindex/utils.py
index f8c5fd45..8f652da7 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:
--
2.17.1
More information about the yocto
mailing list