summaryrefslogtreecommitdiffstats
path: root/bitbake/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-20 15:31:56 +0000
commit5de7744a49bc0523fd65356638457bc51e1b262f (patch)
tree17e82ea482dc038f2bd620a6b786357cbba6d6f2 /bitbake/lib/bb/cache.py
parente10bea36ac0783ac8d184c2c3b3ce729f2d66b20 (diff)
downloadpoky-5de7744a49bc0523fd65356638457bc51e1b262f.tar.gz
bitbake: 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. (Bitbake rev: a44285fc4109236ab89f7aad0a1fc9220eec19b6) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/bb/cache.py')
-rw-r--r--bitbake/lib/bb/cache.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/bitbake/lib/bb/cache.py b/bitbake/lib/bb/cache.py
index 619b9eec24..a3c073a59f 100644
--- a/bitbake/lib/bb/cache.py
+++ b/bitbake/lib/bb/cache.py
@@ -405,12 +405,12 @@ class Cache(object):
405 """Parse the specified filename, returning the recipe information""" 405 """Parse the specified filename, returning the recipe information"""
406 infos = [] 406 infos = []
407 datastores = cls.load_bbfile(filename, appends, configdata) 407 datastores = cls.load_bbfile(filename, appends, configdata)
408 depends = set() 408 depends = []
409 for variant, data in sorted(datastores.iteritems(), 409 for variant, data in sorted(datastores.iteritems(),
410 key=lambda i: i[0], 410 key=lambda i: i[0],
411 reverse=True): 411 reverse=True):
412 virtualfn = cls.realfn2virtual(filename, variant) 412 virtualfn = cls.realfn2virtual(filename, variant)
413 depends |= (data.getVar("__depends", False) or set()) 413 depends = depends + (data.getVar("__depends", False) or [])
414 if depends and not variant: 414 if depends and not variant:
415 data.setVar("__depends", depends) 415 data.setVar("__depends", depends)
416 416