| Message ID | 20240409175858.877459-1-rob.woolley@windriver.com |
|---|---|
| State | Accepted, archived |
| Commit | f10e630fd7561746d835a4378e8777e78f56e44a |
| Headers | show |
| Series | wget: Make wget --passive-ftp option conditional on ftp/ftps | expand |
diff --git a/lib/bb/fetch2/wget.py b/lib/bb/fetch2/wget.py index dc025800..fbfa6938 100644 --- a/lib/bb/fetch2/wget.py +++ b/lib/bb/fetch2/wget.py @@ -87,7 +87,10 @@ class Wget(FetchMethod): if not ud.localfile: ud.localfile = d.expand(urllib.parse.unquote(ud.host + ud.path).replace("/", ".")) - self.basecmd = d.getVar("FETCHCMD_wget") or "/usr/bin/env wget -t 2 -T 30 --passive-ftp" + self.basecmd = d.getVar("FETCHCMD_wget") or "/usr/bin/env wget -t 2 -T 30" + + if ud.type == 'ftp' or ud.type == 'ftps': + self.basecmd += " --passive-ftp" if not self.check_certs(d): self.basecmd += " --no-check-certificate"
Fedora 40 introduces wget2 as a drop-in replacement for wget. This rewrite does not currently have support for FTP. This causes the wget fetcher to fail complaining about an unrecognized option. Making --passive-ftp conditional based on the protocol used in the SRC_URI limits the scope of the problem. It also gives us an opportunity to build the older wget as a host tool. Signed-off-by: Rob Woolley <rob.woolley@windriver.com> --- lib/bb/fetch2/wget.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)