diff options
| author |   Joshua Watt <JPEWhacker@gmail.com> | 2020-05-22 17:08:26 -0500 |
|---|---|---|
| committer |   Steve Sakoman <steve@sakoman.com> | 2020-05-26 06:42:17 -1000 |
| commit | ae65adf471a9ad04c6a44bf020a28f1006db106a (patch) | |
| tree | 83f1c01e6aa5de11a2e13be8b45eab5638dd23f6 /scripts/lib | |
| parent | dbf143d79476e54e8da93101fc16eaedeec88362 (diff) | |
| download | openembedded-core-contrib-ae65adf471a9ad04c6a44bf020a28f1006db106a.tar.gz | |
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
Signed-off-by: Joshua Watt <JPEWhacker@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 26090a2861ebe21224aaf89d7be0c0a89ca58e48)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
Diffstat (limited to 'scripts/lib')
| -rw-r--r-- | scripts/lib/checklayer/__init__.py | 3 |
1 files changed, 3 insertions, 0 deletions
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 |