diff options
Diffstat (limited to 'bitbake/lib')
| -rw-r--r-- | bitbake/lib/bb/fetch2/wget.py | 10 |
1 files changed, 3 insertions, 7 deletions
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): | |||
| 55 | 55 | ||
| 56 | def fetch_uri(uri, ud, d): | 56 | def fetch_uri(uri, ud, d): |
| 57 | if checkonly: | 57 | if checkonly: |
| 58 | fetchcmd = data.getVar("CHECKCOMMAND", d, True) | 58 | fetchcmd = data.getVar("CHECKCOMMAND_wget", d, True) |
| 59 | elif os.path.exists(ud.localpath): | 59 | elif os.path.exists(ud.localpath): |
| 60 | # file exists, but we didnt complete it.. trying again.. | 60 | # file exists, but we didnt complete it.. trying again.. |
| 61 | fetchcmd = data.getVar("RESUMECOMMAND", d, True) | 61 | fetchcmd = data.getVar("RESUMECOMMAND_wget", d, True) |
| 62 | else: | 62 | else: |
| 63 | fetchcmd = data.getVar("FETCHCOMMAND", d, True) | 63 | fetchcmd = data.getVar("FETCHCOMMAND_wget", d, True) |
| 64 | 64 | ||
| 65 | uri = uri.split(";")[0] | 65 | uri = uri.split(";")[0] |
| 66 | uri_decoded = list(decodeurl(uri)) | 66 | uri_decoded = list(decodeurl(uri)) |
| @@ -80,10 +80,6 @@ class Wget(FetchMethod): | |||
| 80 | if not os.path.exists(ud.localpath) and not checkonly: | 80 | if not os.path.exists(ud.localpath) and not checkonly: |
| 81 | raise FetchError("The fetch command returned success for url %s but %s doesn't exist?!" % (uri, ud.localpath), uri) | 81 | raise FetchError("The fetch command returned success for url %s but %s doesn't exist?!" % (uri, ud.localpath), uri) |
| 82 | 82 | ||
| 83 | localdata = data.createCopy(d) | ||
| 84 | data.setVar('OVERRIDES', "wget:" + data.getVar('OVERRIDES', localdata), localdata) | ||
| 85 | data.update_data(localdata) | ||
| 86 | |||
| 87 | fetch_uri(uri, ud, localdata) | 83 | fetch_uri(uri, ud, localdata) |
| 88 | 84 | ||
| 89 | return True | 85 | return True |
