summaryrefslogtreecommitdiffstats
path: root/bitbake/lib/bb/data.py
diff options
context:
space:
mode:
Diffstat (limited to 'bitbake/lib/bb/data.py')
-rw-r--r--bitbake/lib/bb/data.py10
1 files changed, 5 insertions, 5 deletions
diff --git a/bitbake/lib/bb/data.py b/bitbake/lib/bb/data.py
index 82eefef1a6..218998a0af 100644
--- a/bitbake/lib/bb/data.py
+++ b/bitbake/lib/bb/data.py
@@ -156,17 +156,17 @@ 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:
161 val = alterdata.getVar(key, 0)
162 if val is not None and newval is not None:
163 bb.warn("Variable key %s (%s) replaces original key %s (%s)." % (key, val, ekey, newval))
159 164
160 # These two for loops are split for performance to maximise the 165 # These two for loops are split for performance to maximise the
161 # usefulness of the expand cache 166 # usefulness of the expand cache
162 167
163 for key in todolist: 168 for key in todolist:
164 ekey = todolist[key] 169 ekey = todolist[key]
165 newval = alterdata.getVar(ekey, 0)
166 if newval:
167 val = alterdata.getVar(key, 0)
168 if val is not None and newval is not None:
169 bb.warn("Variable key %s (%s) replaces original key %s (%s)." % (key, val, ekey, newval))
170 alterdata.renameVar(key, ekey) 170 alterdata.renameVar(key, ekey)
171 171
172def inheritFromOS(d, savedenv, permitted): 172def inheritFromOS(d, savedenv, permitted):