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 <richard.purdie@linuxfoundation.org>
This commit is contained in:
Richard Purdie 2012-05-04 18:26:00 +01:00
parent c9da0e31f8
commit 3d74d5eed9
1 changed files with 3 additions and 7 deletions

View File

@ -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