diff options
author | Richard Purdie <richard@openedhand.com> | 2007-08-20 07:48:43 +0000 |
---|---|---|
committer | Richard Purdie <richard@openedhand.com> | 2007-08-20 07:48:43 +0000 |
commit | d8bfa5c6eff1cff34895304a33be671fb141084e (patch) | |
tree | 8f63f2cad401f42f5dd30930b0f042aa9c5bdaf8 /bitbake/lib/bb/data.py | |
parent | e68823a20c6e3b629c947bc7e329e5ea71a9860c (diff) | |
download | poky-d8bfa5c6eff1cff34895304a33be671fb141084e.tar.gz |
bitbake: Sync with 1.8.8 release
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2513 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'bitbake/lib/bb/data.py')
-rw-r--r-- | bitbake/lib/bb/data.py | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/bitbake/lib/bb/data.py b/bitbake/lib/bb/data.py index 21cdde04a8..7ad1acad1c 100644 --- a/bitbake/lib/bb/data.py +++ b/bitbake/lib/bb/data.py | |||
@@ -282,6 +282,7 @@ def expandKeys(alterdata, readdata = None): | |||
282 | if readdata == None: | 282 | if readdata == None: |
283 | readdata = alterdata | 283 | readdata = alterdata |
284 | 284 | ||
285 | todolist = {} | ||
285 | for key in keys(alterdata): | 286 | for key in keys(alterdata): |
286 | if not '${' in key: | 287 | if not '${' in key: |
287 | continue | 288 | continue |
@@ -289,7 +290,13 @@ def expandKeys(alterdata, readdata = None): | |||
289 | ekey = expand(key, readdata) | 290 | ekey = expand(key, readdata) |
290 | if key == ekey: | 291 | if key == ekey: |
291 | continue | 292 | continue |
293 | todolist[key] = ekey | ||
292 | 294 | ||
295 | # These two for loops are split for performance to maximise the | ||
296 | # usefulness of the expand cache | ||
297 | |||
298 | for key in todolist: | ||
299 | ekey = todolist[key] | ||
293 | renameVar(key, ekey, alterdata) | 300 | renameVar(key, ekey, alterdata) |
294 | 301 | ||
295 | def expandData(alterdata, readdata = None): | 302 | def expandData(alterdata, readdata = None): |