Browse Source

data: Make expandKeys deterministic

At least in theory, the order the keys are expanded in can make
a difference, particularly if there is key overlap.

We also want to ensure that any underlying base key is processed
before any overridden version of that variable (FOO before FOO_x)
which helps the update_data removal code I've been testing.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Richard Purdie 9 years ago
parent
commit
863b6add24
1 changed files with 1 additions and 1 deletions
  1. 1 1
      lib/bb/data.py

+ 1 - 1
lib/bb/data.py

@@ -159,7 +159,7 @@ def expandKeys(alterdata, readdata = None):
 
     # These two for loops are split for performance to maximise the
     # usefulness of the expand cache
-    for key in todolist:
+    for key in sorted(todolist):
         ekey = todolist[key]
         newval = alterdata.getVar(ekey, 0)
         if newval is not None: