summaryrefslogtreecommitdiffstats
path: root/bitbake/lib/bb/data_smart.py
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2022-02-22 11:36:33 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2022-02-22 11:38:18 +0000
commit6c23bd5c8113c1a8feddf2171626cb02e421b71d (patch)
tree589d6d1846e98d3f27f9c6c8b62da2a709102b27 /bitbake/lib/bb/data_smart.py
parentccbc29bbc4a7d8a4ce2fd708be26b436d7be4194 (diff)
downloadpoky-6c23bd5c8113c1a8feddf2171626cb02e421b71d.tar.gz
bitbake: data_smart: Avoid exceptions for non string data
File "scripts/lib/checklayer/__init__.py", line 49, in _get_layer_collections ldata.expandVarref('LAYERDIR') File "build/bitbake/lib/bb/data_smart.py", line 1007, in expandVarref if referrervalue and ref in referrervalue: TypeError: argument of type 'bool' is not iterable We inject True values as an internal sentinel to the datastore, fix this codepath to handle it. (Bitbake rev: 3b88562d87ac94725c1a683c859c2a6a3287d173) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/bb/data_smart.py')
-rw-r--r--bitbake/lib/bb/data_smart.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/bitbake/lib/bb/data_smart.py b/bitbake/lib/bb/data_smart.py
index e7047d79ca..8d3825f398 100644
--- a/bitbake/lib/bb/data_smart.py
+++ b/bitbake/lib/bb/data_smart.py
@@ -1004,7 +1004,7 @@ class DataSmart(MutableMapping):
1004 value = self.getVar(variable, False) 1004 value = self.getVar(variable, False)
1005 for key in keys: 1005 for key in keys:
1006 referrervalue = self.getVar(key, False) 1006 referrervalue = self.getVar(key, False)
1007 if referrervalue and ref in referrervalue: 1007 if referrervalue and isinstance(referrervalue, str) and ref in referrervalue:
1008 self.setVar(key, referrervalue.replace(ref, value)) 1008 self.setVar(key, referrervalue.replace(ref, value))
1009 1009
1010 def localkeys(self): 1010 def localkeys(self):