浏览代码

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 <[email protected]>
Christian Marangi 3 年之前
父节点
当前提交
5df60f5c24
共有 1 个文件被更改,包括 1 次插入1 次删除
  1. 1 1
      scripts/download.pl

+ 1 - 1
scripts/download.pl

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