checklayer: Skip layers without a collection
PATCH 1/1 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
--- scripts/lib/checklayer/__init__.py | 3 +++ 1 file changed, 3 insertions(+)
scripts/lib/checklayer/__init__.py +3 -0
@@ -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
Signature · 1 line
2.17.1
Steve,
I would like to backport this to dunfell if possible.
Thanks!
Quoted 24 lines · Joshua Watt
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 <[email protected]>--- scripts/lib/checklayer/__init__.py | 3 +++ 1 file changed, 3 insertions(+)scripts/lib/checklayer/__init__.py +3
-0@@ -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
Quoted 1 line · Joshua Watt
I would like to backport this to dunfell if possible.
I've already got it in the next batch of patches!
I really do appreciate the heads up on things that are suitable, I don't want to miss anything :-)
You can find what I'm currently testing at:
https://git.openembedded.org/openembedded-core-contrib/log/?h=stable/dunfell-nut
I try to send a batch out for review at the beginning of each week, so this patch will be sent out with next week's group.
Steve
Quoted 25 lines · Joshua Watt
Quoted 24 lines
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 <[email protected]>--- scripts/lib/checklayer/__init__.py | 3 +++ 1 file changed, 3 insertions(+)scripts/lib/checklayer/__init__.py +3
-0@@ -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