diff options
| author |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-05-26 16:16:45 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-05-29 10:17:16 +0100 |
| commit | 8d8b02aacde8d9fb87a55a7c200a4519bfbe8631 (patch) | |
| tree | e57d5c0b4ddc304271c8b068243f30acb5f5dcbc /bitbake/lib/bb/data.py | |
| parent | 30cba374ccf4db59d5d1933a53057941c8d02e10 (diff) | |
| download | openembedded-core-contrib-8d8b02aacde8d9fb87a55a7c200a4519bfbe8631.tar.gz | |
bitbake: data: Revert expandKeys warning move
This was incorrect, it *must* be done next to the rename as a previous
may overlap with the current one and we need to detect this case.
I'll add a test case to better catch this problem in future.
(Bitbake rev: 5e9d0911cd86e980ab310cc0d79c9383fbc2c844)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
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): |