[openwrt/openwrt] scripts/download.pl: fix mirrors regression for curl and wget

LEDE Commits lede-commits at lists.infradead.org
Mon Sep 26 11:52:30 PDT 2022


ansuel pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/5df60f5c24e40fc373178427a6b654826edbe885

commit 5df60f5c24e40fc373178427a6b654826edbe885
Author: Christian Marangi <ansuelsmth at gmail.com>
AuthorDate: Sun Sep 25 21:43:43 2022 +0200

    scripts/download.pl: fix mirrors regression for curl and wget
    
    With the introduction of aria2c support, curl and wget no longer try to
    download the file from mirrors. Fix this regression by emptying the
    remaining mirrors list only when aria2c is used.
    
    Fixes: d39123626931 ("download.pl: add aria2c support")
    Signed-off-by: Christian Marangi <ansuelsmth at gmail.com>
---
 scripts/download.pl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/download.pl b/scripts/download.pl
index 50dca2335e..51a816cff4 100755
--- a/scripts/download.pl
+++ b/scripts/download.pl
@@ -93,6 +93,7 @@ sub download_cmd {
 	}
 
 	if ($have_aria2c) {
+		@mirrors=();
 		return join(" ", "touch /dev/shm/${rfn}_spp;",
 			qw(aria2c --stderr -c -x2 -s10 -j10 -k1M), $url, $additional_mirrors,
 			$check_certificate ? () : '--check-certificate=false',
@@ -321,7 +322,6 @@ while (!-f "$target/$filename") {
 	if (!-f "$target/$filename" && $url_filename ne $filename) {
 		download($mirror, $filename, @mirrors);
 	}
-	@mirrors=();
 }
 
 $SIG{INT} = \&cleanup;




More information about the lede-commits mailing list