summaryrefslogtreecommitdiffstats
path: root/lib/bb/cache.py
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2012-11-19 15:01:20 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-11-19 15:45:49 +0000
commita44285fc4109236ab89f7aad0a1fc9220eec19b6 (patch)
treecdd7eff64d14e35a2d2b02ad158762c4ca17b4b7 /lib/bb/cache.py
parenta098cebd5c33ebd704efd35d9e655262283cbe1f (diff)
downloadopenembedded-core-contrib-a44285fc4109236ab89f7aad0a1fc9220eec19b6.tar.gz
parse/cache/cooker: Preserve order in the file inclusion list
The data returned by get_file_depends() may me used in contexts like checksums where order is important. The current usage of sets means that some of the checksums can change in circumstances they should not. This patch changes to use lists, thereby removing the problem. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'lib/bb/cache.py')
-rw-r--r--lib/bb/cache.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/bb/cache.py b/lib/bb/cache.py
index 619b9eec24..a3c073a59f 100644
--- a/lib/bb/cache.py
+++ b/lib/bb/cache.py
@@ -405,12 +405,12 @@ class Cache(object):
"""Parse the specified filename, returning the recipe information"""
infos = []
datastores = cls.load_bbfile(filename, appends, configdata)
- depends = set()
+ depends = []
for variant, data in sorted(datastores.iteritems(),
key=lambda i: i[0],
reverse=True):
virtualfn = cls.realfn2virtual(filename, variant)
- depends |= (data.getVar("__depends", False) or set())
+ depends = depends + (data.getVar("__depends", False) or [])
if depends and not variant:
data.setVar("__depends", depends)