diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-05-04 18:27:31 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-05-07 11:03:00 +0100 |
| commit | d4d4aab8dc6f1a75c3a3331e8df71297b3dddcc1 (patch) | |
| tree | 941427f3bbcb8d0ee6b0dfe786221da423d2b6f5 | |
| parent | c77bcfbfe36a7c780ed244c63daec4255f9d4343 (diff) | |
| download | ast2050-yocto-poky-d4d4aab8dc6f1a75c3a3331e8df71297b3dddcc1.zip ast2050-yocto-poky-d4d4aab8dc6f1a75c3a3331e8df71297b3dddcc1.tar.gz | |
bitbake/fetch2/wget: Add fallback/default wget commands
(Bitbake rev: 9586808572d06de4127f6a524e87e9ad75232423)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | bitbake/lib/bb/fetch2/wget.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/bitbake/lib/bb/fetch2/wget.py b/bitbake/lib/bb/fetch2/wget.py index 9d36115..98900ac 100644 --- a/bitbake/lib/bb/fetch2/wget.py +++ b/bitbake/lib/bb/fetch2/wget.py @@ -54,12 +54,12 @@ class Wget(FetchMethod): """Fetch urls""" if checkonly: - fetchcmd = data.getVar("CHECKCOMMAND_wget", d, True) + fetchcmd = data.getVar("CHECKCOMMAND_wget", d, True) or d.expand("/usr/bin/env wget --spider -t 5 --passive-ftp --no-check-certificate -P ${DL_DIR} '${URI}'") elif os.path.exists(ud.localpath): # file exists, but we didnt complete it.. trying again.. - fetchcmd = data.getVar("RESUMECOMMAND_wget", d, True) + fetchcmd = data.getVar("RESUMECOMMAND_wget", d, True) or d.expand("/usr/bin/env wget -c -t 5 -nv --passive-ftp --no-check-certificate -P ${DL_DIR} '${URI}'") else: - fetchcmd = data.getVar("FETCHCOMMAND_wget", d, True) + fetchcmd = data.getVar("FETCHCOMMAND_wget", d, True) or d.expand("/usr/bin/env wget -t 5 -nv --passive-ftp --no-check-certificate -P ${DL_DIR} '${URI}'") uri = uri.split(";")[0] uri_decoded = list(decodeurl(uri)) @@ -78,7 +78,7 @@ class Wget(FetchMethod): # Also, this used to happen if sourceforge sent us to the mirror page 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) - + return True def checkstatus(self, uri, ud, d): |
