bitbake: data: Clean up expandKeys None value handling
This comparison is interesting even in the case of empty vales. Enabling this warning actually found a bug in the metadata in avahi. Make the code handle None specifically and also remove the dead code path in the second if statement. (Bitbake rev: a4cd4c56284812efb2a2bc0c8667ddad073f8e94) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
c7f01ce273
commit
30cba374cc
|
@ -157,9 +157,9 @@ def expandKeys(alterdata, readdata = None):
|
|||
continue
|
||||
todolist[key] = ekey
|
||||
newval = alterdata.getVar(ekey, 0)
|
||||
if newval:
|
||||
if newval is not None:
|
||||
val = alterdata.getVar(key, 0)
|
||||
if val is not None and newval is not None:
|
||||
if val is not None:
|
||||
bb.warn("Variable key %s (%s) replaces original key %s (%s)." % (key, val, ekey, newval))
|
||||
|
||||
# These two for loops are split for performance to maximise the
|
||||
|
|
Loading…
Reference in New Issue