[bitbake-devel] [PATCH] data: Clean up expandKeys None value handling
Richard Purdie
richard.purdie at linuxfoundation.org
Tue May 26 10:41:02 UTC 2015
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 <richard.purdie at linuxfoundation.org>
diff --git a/bitbake/lib/bb/data.py b/bitbake/lib/bb/data.py
index 0d9da4c..e7557aa 100644
--- a/bitbake/lib/bb/data.py
+++ b/bitbake/lib/bb/data.py
@@ -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
More information about the bitbake-devel
mailing list