From 30cba374ccf4db59d5d1933a53057941c8d02e10 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Tue, 26 May 2015 11:41:02 +0100 Subject: [PATCH] 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 --- bitbake/lib/bb/data.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bitbake/lib/bb/data.py b/bitbake/lib/bb/data.py index 218998a0af0..f8dc976a1c8 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 -- 2.47.3