summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZhai Edwin <edwin.zhai@intel.com>2011-02-11 21:55:07 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-02-11 14:07:49 +0000
commit49a18f1748d2417958b8e19cdd58c0c79f4fc728 (patch)
treeca91e160ea19361f11c0835a95d4433440103fff
parent05d8b6422dc3154b2890f8db3f919faec4457d6f (diff)
downloadpoky-49a18f1748d2417958b8e19cdd58c0c79f4fc728.tar.gz
poky-49a18f1748d2417958b8e19cdd58c0c79f4fc728.tar.bz2
poky-49a18f1748d2417958b8e19cdd58c0c79f4fc728.zip
sstate: Fix bugs after new fetcher
Current sstate's fetch code doesn't reflect latest fetcher changes, so old fetch style cause exception and fail silently. [BUGID #708] got fixed. Another issue is "import xxx" in python function from sstate.bbclass can only sit in the head of the function, else have UnboundLocalError: "local variable XXX referenced before assignment". Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
-rw-r--r--meta/classes/sstate.bbclass6
1 files changed, 3 insertions, 3 deletions
diff --git a/meta/classes/sstate.bbclass b/meta/classes/sstate.bbclass
index e4564e4b07..4f1bc39e7a 100644
--- a/meta/classes/sstate.bbclass
+++ b/meta/classes/sstate.bbclass
@@ -326,13 +326,13 @@ def sstate_package(ss, d):
return
def pstaging_fetch(sstatepkg, d):
+ import bb.fetch2
# Only try and fetch if the user has configured a mirror
mirrors = bb.data.getVar('SSTATE_MIRRORS', d, True)
if not mirrors:
return
- import bb.fetch2
# Copy the data object and override DL_DIR and SRC_URI
localdata = bb.data.createCopy(d)
bb.data.update_data(localdata)
@@ -453,8 +453,8 @@ def sstate_checkhashes(sq_fn, sq_task, sq_hash, sq_hashfn, d):
#bb.note(str(srcuri))
try:
- bb.fetch.init(srcuri.split(), localdata)
- bb.fetch.checkstatus(localdata, srcuri.split())
+ fetcher = bb.fetch2.Fetch(srcuri.split(), localdata)
+ fetcher.checkstatus()
ret.append(task)
except:
pass