diff options
| author |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-05-27 17:37:33 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-05-29 10:14:41 +0100 |
| commit | 863b6add24c211d64ba7931647084321f2d65889 (patch) | |
| tree | 211d7348ed9121ac65d4dcc7f305f246772c3c72 /lib/bb/data.py | |
| parent | 366af3be1cffd64e4a79c15990c1e05869022c14 (diff) | |
| download | bitbake-contrib-863b6add24c211d64ba7931647084321f2d65889.tar.gz | |
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>
Diffstat (limited to 'lib/bb/data.py')
| -rw-r--r-- | lib/bb/data.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/bb/data.py b/lib/bb/data.py index 439c36593..84f5355e4 100644 --- a/lib/bb/data.py +++ b/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: |