diff options
author | Cristian Iorga <cristian.iorga@intel.com> | 2012-11-26 19:54:22 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-12-07 17:25:54 +0000 |
commit | cbec839886afa3352f9417c970f7a63c69f28e3f (patch) | |
tree | 6776ce94b7ba2004006c1a11e8a103f431851376 | |
parent | a17b62e60464bc4dea814e99cd9d6ead31a316db (diff) | |
download | poky-cbec839886afa3352f9417c970f7a63c69f28e3f.tar.gz |
bitbake: fetch2/wget: Fix for mixed-up wget commands
wget commands for check and resume were
mixed-up, leading to the following issues:
1. long running "NOTE: Preparing runqueue"
reason: objects were downloaded, not spidered on the mirror
2. Failing network test in Build Appliance, because wget 1.14
(in use in BA) will fail if a file already exists.
During the network connectivity test, index.php file was
actually downloaded, not spidered (checked for existence on
yoctoproject.org website), leading to wget failure.
(Bitbake rev: 6f960055f55c5559562e8cc89961508fc27bf3eb)
Signed-off-by: Cristian Iorga <cristian.iorga@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | bitbake/lib/bb/fetch2/wget.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/bitbake/lib/bb/fetch2/wget.py b/bitbake/lib/bb/fetch2/wget.py index ea99198a7b..2808df6ac0 100644 --- a/bitbake/lib/bb/fetch2/wget.py +++ b/bitbake/lib/bb/fetch2/wget.py | |||
@@ -69,10 +69,10 @@ class Wget(FetchMethod): | |||
69 | basecmd += " -O ${DL_DIR}/" + ud.localfile | 69 | basecmd += " -O ${DL_DIR}/" + ud.localfile |
70 | 70 | ||
71 | if checkonly: | 71 | if checkonly: |
72 | fetchcmd = d.getVar("CHECKCOMMAND_wget", True) or d.expand(basecmd + " -c -P ${DL_DIR} '${URI}'") | 72 | fetchcmd = d.getVar("CHECKCOMMAND_wget", True) or d.expand(basecmd + " --spider '${URI}'") |
73 | elif os.path.exists(ud.localpath): | 73 | elif os.path.exists(ud.localpath): |
74 | # file exists, but we didnt complete it.. trying again.. | 74 | # file exists, but we didnt complete it.. trying again.. |
75 | fetchcmd = d.getVar("RESUMECOMMAND_wget", True) or d.expand(basecmd + " --spider -P ${DL_DIR} '${URI}'") | 75 | fetchcmd = d.getVar("RESUMECOMMAND_wget", True) or d.expand(basecmd + " -c -P ${DL_DIR} '${URI}'") |
76 | else: | 76 | else: |
77 | fetchcmd = d.getVar("FETCHCOMMAND_wget", True) or d.expand(basecmd + " -P ${DL_DIR} '${URI}'") | 77 | fetchcmd = d.getVar("FETCHCOMMAND_wget", True) or d.expand(basecmd + " -P ${DL_DIR} '${URI}'") |
78 | 78 | ||