[bitbake-devel] [PATCH] bitbake/fetch2/wget: Remove unnecessary use of OVERRIDES
Richard Purdie
richard.purdie at linuxfoundation.org
Fri May 4 17:26:00 UTC 2012
This allows some simplifications of the function and is slightly faster.
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
diff --git a/bitbake/lib/bb/fetch2/wget.py b/bitbake/lib/bb/fetch2/wget.py
index d3be069..89bf57b 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
More information about the bitbake-devel
mailing list