data: Clean up expandKeys None value handling
PATCH 1/1 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.
Signed-off-by Richard Purdie <[email protected]>
bitbake/lib/bb/data.py +2 -2
@@ -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
Quoted 5 lines · Richard Purdie
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.
LGTM, but I cannot approve it.
Thanks for the fix!
Cheers,
Quoted 20 lines
Signed-off-by Richard Purdie <[email protected]>bitbake/lib/bb/data.py +2
-2@@ -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