summaryrefslogtreecommitdiffstats
path: root/bitbake/lib/bb
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2015-05-26 16:16:45 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-05-29 10:17:16 +0100
commit8d8b02aacde8d9fb87a55a7c200a4519bfbe8631 (patch)
treee57d5c0b4ddc304271c8b068243f30acb5f5dcbc /bitbake/lib/bb
parent30cba374ccf4db59d5d1933a53057941c8d02e10 (diff)
downloadpoky-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')
-rw-r--r--bitbake/lib/bb/data.py11
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):
156 if key == ekey: 156 if key == ekey:
157 continue 157 continue
158 todolist[key] = ekey 158 todolist[key] = ekey
159 newval = alterdata.getVar(ekey, 0)
160 if newval is not None:
161 val = alterdata.getVar(key, 0)
162 if val is not None:
163 bb.warn("Variable key %s (%s) replaces original key %s (%s)." % (key, val, ekey, newval))
164 159
165 # These two for loops are split for performance to maximise the 160 # These two for loops are split for performance to maximise the
166 # usefulness of the expand cache 161 # usefulness of the expand cache
167
168 for key in todolist: 162 for key in todolist:
169 ekey = todolist[key] 163 ekey = todolist[key]
164 newval = alterdata.getVar(ekey, 0)
165 if newval is not None:
166 val = alterdata.getVar(key, 0)
167 if val is not None:
168 bb.warn("Variable key %s (%s) replaces original key %s (%s)." % (key, val, ekey, newval))
170 alterdata.renameVar(key, ekey) 169 alterdata.renameVar(key, ekey)
171 170
172def inheritFromOS(d, savedenv, permitted): 171def inheritFromOS(d, savedenv, permitted):