diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-02-28 17:25:21 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-03-02 17:25:29 +0000 |
commit | 5f0e3a8800b1939fa9573ddef8a279140c91ec3c (patch) | |
tree | 0f6a87ac441099a64a7d2e39a32d47a8158cd0ee /bitbake | |
parent | 6265744ec579081f6abcf60390c650728157ae54 (diff) | |
download | ast2050-yocto-poky-5f0e3a8800b1939fa9573ddef8a279140c91ec3c.zip ast2050-yocto-poky-5f0e3a8800b1939fa9573ddef8a279140c91ec3c.tar.gz |
bitbake: fetch/wget: Start to clean up command construction
Start to clean up wget fetcher command construction to allow clearer
and more extensible code structure. Drops support for ${URI} and
${FILE} directly in the commands.
(Bitbake rev: 4e59fe45be2088996abc21e9a631a32b9a9642c9)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake')
-rw-r--r-- | bitbake/lib/bb/fetch2/wget.py | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/bitbake/lib/bb/fetch2/wget.py b/bitbake/lib/bb/fetch2/wget.py index e2f99ce..bb686b5 100644 --- a/bitbake/lib/bb/fetch2/wget.py +++ b/bitbake/lib/bb/fetch2/wget.py @@ -58,28 +58,27 @@ class Wget(FetchMethod): ud.localfile = data.expand(urllib.unquote(ud.basename), d) + self.basecmd = d.getVar("FETCHCMD_wget", True) or "/usr/bin/env wget -t 2 -T 30 -nv --passive-ftp --no-check-certificate" + def download(self, ud, d, checkonly = False): """Fetch urls""" - basecmd = d.getVar("FETCHCMD_wget", True) or "/usr/bin/env wget -t 2 -T 30 -nv --passive-ftp --no-check-certificate" + fetchcmd = self.basecmd if not checkonly and 'downloadfilename' in ud.parm: dldir = d.getVar("DL_DIR", True) bb.utils.mkdirhier(os.path.dirname(dldir + os.sep + ud.localfile)) - basecmd += " -O " + dldir + os.sep + ud.localfile + fetchcmd += " -O " + dldir + os.sep + ud.localfile + uri = ud.url.split(";")[0] if checkonly: - fetchcmd = d.expand(basecmd + " --spider '${URI}'") + fetchcmd = self.basecmd + " --spider '%s'" % uri elif os.path.exists(ud.localpath): # file exists, but we didnt complete it.. trying again.. - fetchcmd = d.expand(basecmd + " -c -P ${DL_DIR} '${URI}'") + fetchcmd = self.basecmd + d.expand(" -c -P ${DL_DIR} '%s'" % uri) else: - fetchcmd = d.expand(basecmd + " -P ${DL_DIR} '${URI}'") - - uri = ud.url.split(";")[0] + fetchcmd = self.basecmd + d.expand(" -P ${DL_DIR} '%s'" % uri) - fetchcmd = fetchcmd.replace("${URI}", uri.split(";")[0]) - fetchcmd = fetchcmd.replace("${FILE}", ud.basename) if not checkonly: logger.info("fetch " + uri) logger.debug(2, "executing " + fetchcmd) |