From 5b65a822d6fd2f539969cef6a08db89d465f07f8 Mon Sep 17 00:00:00 2001 From: Joshua Watt Date: Fri, 22 May 2020 17:08:26 -0500 Subject: checklayer: Skip layers without a collection As in other places in the file, skip layers that don't define a collection when searching for a layer to resolve a dependency. Fixes KeyError exceptions when attempting to access the layer collections later (From OE-Core rev: ae65adf471a9ad04c6a44bf020a28f1006db106a) Signed-off-by: Joshua Watt Signed-off-by: Richard Purdie (cherry picked from commit 26090a2861ebe21224aaf89d7be0c0a89ca58e48) Signed-off-by: Steve Sakoman Signed-off-by: Richard Purdie --- scripts/lib/checklayer/__init__.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/scripts/lib/checklayer/__init__.py b/scripts/lib/checklayer/__init__.py index 5aeec2f00f..1138000275 100644 --- a/scripts/lib/checklayer/__init__.py +++ b/scripts/lib/checklayer/__init__.py @@ -143,6 +143,9 @@ def detect_layers(layer_directories, no_auto): def _find_layer_depends(depend, layers): for layer in layers: + if 'collections' not in layer: + continue + for collection in layer['collections']: if depend == collection: return layer -- cgit v1.2.3-54-g00ecf