summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-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):