bitbake: Sync with 1.8.8 release

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2513 311d38ba-8fff-0310-9ca6-ca027cbcb966

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):
     if readdata == None:
         readdata = alterdata
 
+    todolist = {}
     for key in keys(alterdata):
         if not '${' in key:
             continue
@@ -289,7 +290,13 @@ def expandKeys(alterdata, readdata = None):
         ekey = expand(key, readdata)
         if key == ekey:
             continue
+        todolist[key] = ekey
 
+    # These two for loops are split for performance to maximise the 
+    # usefulness of the expand cache
+
+    for key in todolist:
+        ekey = todolist[key]
         renameVar(key, ekey, alterdata)
 
 def expandData(alterdata, readdata = None):