diff options
| author |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-05-04 18:26:00 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-05-07 11:01:03 +0100 |
| commit | 5999dc9985ad087c036611bfaa59b090a08781a6 (patch) | |
| tree | 0c692c6bbbfb6e98f5bbd04d532b9fbec9c32fb3 /lib/bb/fetch2/wget.py | |
| parent | ffec38675c0d78ee9fcd1d8f5a746d162145554e (diff) | |
| download | bitbake-5999dc9985ad087c036611bfaa59b090a08781a6.tar.gz | |
bitbake/fetch2/wget: Remove unnecessary use of OVERRIDES
This allows some simplifications of the function and is slightly faster.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'lib/bb/fetch2/wget.py')
| -rw-r--r-- | lib/bb/fetch2/wget.py | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/lib/bb/fetch2/wget.py b/lib/bb/fetch2/wget.py index d3be06957..89bf57ba1 100644 --- a/lib/bb/fetch2/wget.py +++ b/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 |