diff options
| -rw-r--r-- | bitbake/lib/bb/data.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/bitbake/lib/bb/data.py b/bitbake/lib/bb/data.py index 110666ca2b..abf210aa6b 100644 --- a/bitbake/lib/bb/data.py +++ b/bitbake/lib/bb/data.py | |||
| @@ -158,9 +158,9 @@ def expandKeys(alterdata, readdata = None): | |||
| 158 | 158 | ||
| 159 | for key in todolist: | 159 | for key in todolist: |
| 160 | ekey = todolist[key] | 160 | ekey = todolist[key] |
| 161 | if ekey in keys(alterdata): | 161 | newval = alterdata.getVar(ekey, 0) |
| 162 | if newval: | ||
| 162 | val = alterdata.getVar(key, 0) | 163 | val = alterdata.getVar(key, 0) |
| 163 | newval = alterdata.getVar(ekey, 0) | ||
| 164 | if val is not None and newval is not None: | 164 | if val is not None and newval is not None: |
| 165 | bb.warn("Variable key %s (%s) replaces original key %s (%s)." % (key, val, ekey, newval)) | 165 | bb.warn("Variable key %s (%s) replaces original key %s (%s)." % (key, val, ekey, newval)) |
| 166 | alterdata.renameVar(key, ekey) | 166 | alterdata.renameVar(key, ekey) |