diff mbox series

[layerindex-web,2/6] utils.py: Use get_layer_var() to get BBFILE_COLLECTIONS

Message ID 3743999127b48ee332fdbf3ed25cc3bdd76dfa74.1671208436.git.tim.orling@konsulko.com
State New
Headers show
Series [layerindex-web,1/6] Dockerfile: add captcha dependencies | expand

Commit Message

Tim Orling Dec. 16, 2022, 4:42 p.m. UTC 
From: Robert Yang <liezhi.yang@windriver.com>

The commit 38e6288c7dad579518b0de2b6664f23be58889b6 has added oe-core to
BBLAYERS by default, and then there will be multiple BBFILE_COLLECTIONS which
causes update.py failure to update layers (most of the dependencies or
recommends are missing), use get_layer_var() to get BBFILE_COLLECTIONS to fix
the problem since it can ignore the extra oe-core from BBFILE_COLLECTIONS.

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Fix minor typos. Minor rewording.
Signed-off-by: Tim Orling <tim.orling@konsulko.com>
---
 layerindex/utils.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
diff mbox series

Patch

diff --git a/layerindex/utils.py b/layerindex/utils.py
index efd18e4..ed7fb47 100644
--- a/layerindex/utils.py
+++ b/layerindex/utils.py
@@ -188,7 +188,7 @@  def _add_dependency(var, name, layerbranch, config_data, logger=None, required=T
             logger.warn('Either set REMOVE_LAYER_DEPENDENCIES to remove them from the database, or fix conf/layer.conf')
 
 def set_layerbranch_collection_version(layerbranch, config_data, logger=None):
-    layerbranch.collection = config_data.getVar('BBFILE_COLLECTIONS', True)
+    layerbranch.collection = get_layer_var(config_data, 'BBFILE_COLLECTIONS', logger)
     ver_str = "LAYERVERSION_"
     if layerbranch.collection:
         layerbranch.collection = layerbranch.collection.strip()