| Submitter | Cristian Iorga |
|---|---|
| Date | Nov. 26, 2012, 5:54 p.m. |
| Message ID | <1353952462-18652-1-git-send-email-cristian.iorga@intel.com> |
| Download | mbox | patch |
| Permalink | /patch/39619/ |
| State | New |
| Headers | show |
Comments
On Mon, Nov 26, 2012 at 3:54 PM, Cristian Iorga <cristian.iorga@intel.com> wrote: > 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. > > Signed-off-by: Cristian Iorga <cristian.iorga@intel.com> I agree with the fix but this needs to be send to the bitbake-devel mailing list ;-)
Patch
diff --git a/bitbake/lib/bb/fetch2/wget.py b/bitbake/lib/bb/fetch2/wget.py index ea99198..2808df6 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}'")
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. Signed-off-by: Cristian Iorga <cristian.iorga@intel.com> --- bitbake/lib/bb/fetch2/wget.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)