diff options
Diffstat (limited to 'bitbake/lib/bb/data.py')
| -rw-r--r-- | bitbake/lib/bb/data.py | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/bitbake/lib/bb/data.py b/bitbake/lib/bb/data.py index f8dc976a1c..439c36593d 100644 --- a/bitbake/lib/bb/data.py +++ b/bitbake/lib/bb/data.py @@ -156,17 +156,16 @@ def expandKeys(alterdata, readdata = None): if key == ekey: continue todolist[key] = ekey - newval = alterdata.getVar(ekey, 0) - if newval is not None: - val = alterdata.getVar(key, 0) - 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 # usefulness of the expand cache - for key in todolist: ekey = todolist[key] + newval = alterdata.getVar(ekey, 0) + if newval is not None: + val = alterdata.getVar(key, 0) + if val is not None: + bb.warn("Variable key %s (%s) replaces original key %s (%s)." % (key, val, ekey, newval)) alterdata.renameVar(key, ekey) def inheritFromOS(d, savedenv, permitted): |