mirror of
https://git.yoctoproject.org/poky
synced 2026-05-01 06:32:11 +02:00
bitbake: fetch2: Fix urldata_cache key issues
Upon inspection its clear the way the keys for this cache were being handled would break it and cause the cache to never be used. Fix this. (Bitbake rev: 9a5dd1be63395c76d3fac2c3c7ba6557fe47b442) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
@@ -1631,8 +1631,11 @@ class Fetch(object):
|
||||
|
||||
fn = d.getVar('FILE')
|
||||
mc = d.getVar('__BBMULTICONFIG') or ""
|
||||
if cache and fn and mc + fn in urldata_cache:
|
||||
self.ud = urldata_cache[mc + fn + str(id(d))]
|
||||
key = None
|
||||
if cache and fn:
|
||||
key = mc + fn + str(id(d))
|
||||
if key in urldata_cache:
|
||||
self.ud = urldata_cache[key]
|
||||
|
||||
for url in urls:
|
||||
if url not in self.ud:
|
||||
@@ -1643,8 +1646,8 @@ class Fetch(object):
|
||||
self.ud[url] = None
|
||||
pass
|
||||
|
||||
if fn and cache:
|
||||
urldata_cache[mc + fn + str(id(d))] = self.ud
|
||||
if key:
|
||||
urldata_cache[key] = self.ud
|
||||
|
||||
def localpath(self, url):
|
||||
if url not in self.urls:
|
||||
|
||||
Reference in New Issue
Block a user