summaryrefslogtreecommitdiff
path: root/bitbake/lib/bb/fetch
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2007-08-04 20:13:35 +0000
committerRichard Purdie <richard@openedhand.com>2007-08-04 20:13:35 +0000
commit89853852ed422e5be7e488ea2389fc7760f97d29 (patch)
tree4deb0cf475e833d3e77ed467327f85ebae877a32 /bitbake/lib/bb/fetch
parent51df8408c139e99e5d4f7fabe235eee4bd05d3fd (diff)
downloadopenembedded-core-89853852ed422e5be7e488ea2389fc7760f97d29.tar.gz
openembedded-core-89853852ed422e5be7e488ea2389fc7760f97d29.tar.bz2
openembedded-core-89853852ed422e5be7e488ea2389fc7760f97d29.tar.xz
openembedded-core-89853852ed422e5be7e488ea2389fc7760f97d29.zip
bitbake: Try to fix cache locking issue
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2361 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'bitbake/lib/bb/fetch')
-rw-r--r--bitbake/lib/bb/fetch/__init__.py12
1 files changed, 7 insertions, 5 deletions
diff --git a/bitbake/lib/bb/fetch/__init__.py b/bitbake/lib/bb/fetch/__init__.py
index 6ebf5a34a..9333e2b60 100644
--- a/bitbake/lib/bb/fetch/__init__.py
+++ b/bitbake/lib/bb/fetch/__init__.py
@@ -106,7 +106,7 @@ def init(urls, d, cache = True):
urldata = {}
if cache:
- urldata, pd, fn = getdata(d)
+ urldata = getdata(d)
for url in urls:
if url not in urldata:
@@ -119,6 +119,8 @@ def init(urls, d, cache = True):
urldata[url] = ud
if cache:
+ fn = bb.data.getVar('FILE', d, 1)
+ pd = persist_data.PersistData(d)
pd.setValue("BB_URLDATA", fn, pickle.dumps(urldata, 0))
return urldata
@@ -131,14 +133,14 @@ def getdata(d):
if encdata:
urldata = pickle.loads(str(encdata))
- return urldata, pd, fn
+ return urldata
def go(d, urldata = None):
"""
Fetch all urls
"""
if not urldata:
- urldata, pd, fn = getdata(d)
+ urldata = getdata(d)
for u in urldata:
ud = urldata[u]
@@ -158,7 +160,7 @@ def localpaths(d, urldata = None):
"""
local = []
if not urldata:
- urldata, pd, fn = getdata(d)
+ urldata = getdata(d)
for u in urldata:
ud = urldata[u]
@@ -175,7 +177,7 @@ def get_srcrev(d):
have been set.
"""
scms = []
- urldata, pd, fn = getdata(d)
+ urldata = getdata(d)
if len(urldata) == 0:
src_uri = bb.data.getVar('SRC_URI', d, 1).split()
for url in src_uri: