diff options
| -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) |
