From cbec839886afa3352f9417c970f7a63c69f28e3f Mon Sep 17 00:00:00 2001 From: Cristian Iorga Date: Mon, 26 Nov 2012 19:54:22 +0200 Subject: 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 Signed-off-by: Richard Purdie --- bitbake/lib/bb/fetch2/wget.py | 4 ++-- 1 file 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): basecmd += " -O ${DL_DIR}/" + ud.localfile if checkonly: - fetchcmd = d.getVar("CHECKCOMMAND_wget", True) or d.expand(basecmd + " -c -P ${DL_DIR} '${URI}'") + fetchcmd = d.getVar("CHECKCOMMAND_wget", True) or d.expand(basecmd + " --spider '${URI}'") elif os.path.exists(ud.localpath): # file exists, but we didnt complete it.. trying again.. - fetchcmd = d.getVar("RESUMECOMMAND_wget", True) or d.expand(basecmd + " --spider -P ${DL_DIR} '${URI}'") + fetchcmd = d.getVar("RESUMECOMMAND_wget", True) or d.expand(basecmd + " -c -P ${DL_DIR} '${URI}'") else: fetchcmd = d.getVar("FETCHCOMMAND_wget", True) or d.expand(basecmd + " -P ${DL_DIR} '${URI}'") -- cgit v1.2.3-54-g00ecf