From 49a18f1748d2417958b8e19cdd58c0c79f4fc728 Mon Sep 17 00:00:00 2001 From: Zhai Edwin Date: Fri, 11 Feb 2011 21:55:07 +0800 Subject: 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 --- meta/classes/sstate.bbclass | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/meta/classes/sstate.bbclass b/meta/classes/sstate.bbclass index e4564e4..4f1bc39 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 -- cgit v1.1