Skip to contentSkip to conversation

lib/packagedata: Fix for new overrides

PATCH New Joshua Watt 1 participant 1 message Aug 12, 2021

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 lib/packagedata: Fix for new overrides

Fix read_subpkgdata_dict to account for the new override operator being ":" instead of "_"

---
 meta/lib/oe/packagedata.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
meta/lib/oe/packagedata.py +3 -3
index d7914524b5..c6f96d81fd 100644
@@ -45,14 +45,14 @@ def read_pkgdata(pn, d):
     return read_pkgdatafile(fn)
 
 #
-# Collapse FOO_pkg variables into FOO
+# Collapse FOO:pkg variables into FOO
 #
 def read_subpkgdata_dict(pkg, d):
     ret = {}
     subd = read_pkgdatafile(get_subpkgedata_fn(pkg, d))
     for var in subd:
-        newvar = var.replace("_" + pkg, "")
-        if newvar == var and var + "_" + pkg in subd:
+        newvar = var.replace(":" + pkg, "")
+        if newvar == var and var + ":" + pkg in subd:
             continue
         ret[newvar] = subd[var]
     return ret
Signature · 1 line
2.32.0