MIRRORS/poky
1
0
Fork 0
mirror of git://git.yoctoproject.org/poky.git synced 2025-07-19 12:59:02 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

bitbake: bitbake: data_smart: fix ??= operator for variable flags

Browse Source 
Variable flags have been fixed in commit
0329a7e3ac694737f2d2c1861f65492551360663 which introduces the
"_defaultval_flag_" prefix for default values.

This must not be ignored in delVarFlags and getVarFlags.

Fixes [YOCTO #15685]

(Bitbake rev: 2ee079fc1b7cf6d384ca17bd034b0a40461d9d18)

Signed-off-by: Louis Rannou <louis.rannou@non.se.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Louis Rannou 2025-02-13 16:05:42 +01:00 committed by Richard Purdie
parent c49684b48b
commit 0a9cfebb3a
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
bitbake/lib/bb/data_smart.py
View File

@ -920,6 +920,8 @@ class DataSmart(MutableMapping):
self.varhistory.record(**loginfo) self.varhistory.record(**loginfo)
del self.dict[var][flag] del self.dict[var][flag]
if ("_defaultval_flag_" + flag) in self.dict[var]:
del self.dict[var]["_defaultval_flag_" + flag]
def appendVarFlag(self, var, flag, value, **loginfo): def appendVarFlag(self, var, flag, value, **loginfo):
loginfo['op'] = 'append' loginfo['op'] = 'append'
@ -954,17 +956,22 @@ class DataSmart(MutableMapping):
flags = {} flags = {}
if local_var: if local_var:
for i in local_var: for i, val in local_var.items():
if i.startswith(("_", ":")) and not internalflags: if i.startswith("_defaultval_flag_") and not internalflags:
i = i[len("_defaultval_flag_"):]
if i not in local_var:
flags[i] = val
elif i.startswith(("_", ":")) and not internalflags:
continue continue
flags[i] = local_var[i] else:
flags[i] = val
if expand and i in expand: if expand and i in expand:
flags[i] = self.expand(flags[i], var + "[" + i + "]") flags[i] = self.expand(flags[i], var + "[" + i + "]")
if len(flags) == 0: if len(flags) == 0:
return None return None
return flags return flags
def delVarFlags(self, var, **loginfo): def delVarFlags(self, var, **loginfo):
self.expand_cache = {} self.expand_cache = {}
if not var in self.dict: if not var in self.dict: