If a LAYERRECOMMENDS relationship is not satisfied, we shouldn't be
erroring out - it's a recommendation, not a hard dependency. Just show a
warning and allow processing to continue.
Signed-off-by: Paul Eggleton <paul.eggle...@linux.intel.com>
---
layerindex/recipeparse.py | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/layerindex/recipeparse.py b/layerindex/recipeparse.py
index f1c1bd32..bc8a19ef 100644
--- a/layerindex/recipeparse.py
+++ b/layerindex/recipeparse.py
@@ -102,7 +102,11 @@ def setup_layer(config_data, fetchdir, layerdir, layer,
layerbranch):
deprepodir = os.path.join(fetchdir, depurldir)
deplayerbranch =
dep.dependency.get_layerbranch(layerbranch.branch.name)
if not deplayerbranch:
- raise RecipeParseError('Dependency %s of layer %s does not have
branch record for branch %s' % (dep.dependency.name, layer.name,
layerbranch.branch.name))
+ if dep.required:
+ raise RecipeParseError('Dependency %s of layer %s does not
have branch record for branch %s' % (dep.dependency.name, layer.name,
layerbranch.branch.name))
+ else:
+ logger.warning('Recommends %s of layer %s does not have branch
record for branch %s - ignoring' % (dep.dependency.name, layer.name,
layerbranch.branch.name))
+ continue
deplayerdir = os.path.join(deprepodir, deplayerbranch.vcs_subdir)
utils.parse_layer_conf(deplayerdir, config_data_copy)
config_data_copy.delVar('LAYERDIR')
--
2.17.1
--
_______________________________________________
yocto mailing list
yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/yocto
