From 3d74d5eed9be82f0c99749a200f109e290b26b4d Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Fri, 4 May 2012 18:26:00 +0100 Subject: bitbake/fetch2/wget: Remove unnecessary use of OVERRIDES This allows some simplifications of the function and is slightly faster. (Bitbake rev: 5999dc9985ad087c036611bfaa59b090a08781a6) Signed-off-by: Richard Purdie --- bitbake/lib/bb/fetch2/wget.py | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'bitbake/lib/bb/fetch2/wget.py') diff --git a/bitbake/lib/bb/fetch2/wget.py b/bitbake/lib/bb/fetch2/wget.py index d3be069576..89bf57ba1f 100644 --- a/bitbake/lib/bb/fetch2/wget.py +++ b/bitbake/lib/bb/fetch2/wget.py @@ -55,12 +55,12 @@ class Wget(FetchMethod): def fetch_uri(uri, ud, d): if checkonly: - fetchcmd = data.getVar("CHECKCOMMAND", d, True) + fetchcmd = data.getVar("CHECKCOMMAND_wget", d, True) elif os.path.exists(ud.localpath): # file exists, but we didnt complete it.. trying again.. - fetchcmd = data.getVar("RESUMECOMMAND", d, True) + fetchcmd = data.getVar("RESUMECOMMAND_wget", d, True) else: - fetchcmd = data.getVar("FETCHCOMMAND", d, True) + fetchcmd = data.getVar("FETCHCOMMAND_wget", d, True) uri = uri.split(";")[0] uri_decoded = list(decodeurl(uri)) @@ -80,10 +80,6 @@ class Wget(FetchMethod): if not os.path.exists(ud.localpath) and not checkonly: raise FetchError("The fetch command returned success for url %s but %s doesn't exist?!" % (uri, ud.localpath), uri) - localdata = data.createCopy(d) - data.setVar('OVERRIDES', "wget:" + data.getVar('OVERRIDES', localdata), localdata) - data.update_data(localdata) - fetch_uri(uri, ud, localdata) return True -- cgit v1.2.3-54-g00ecf