From cf4b9118e32d9d4546cbeac7b63462bdd4de77b5 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Fri, 2 Aug 2024 17:56:17 +0000 Subject: [PATCH] make.sh: Show the packages that failed to download https://lists.ipfire.org/hyperkitty/list/development@lists.ipfire.org/thread/VCTWCJKYKCGN7TUKMYWVJY3QUX4FIDT5/ Signed-off-by: Michael Tremer --- make.sh | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/make.sh b/make.sh index d2054eff31..10ec607b16 100755 --- a/make.sh +++ b/make.sh @@ -1090,7 +1090,7 @@ download_sources() { local file local pkg - local status=0 + local failed_packages=() # Walk through all files in LFS for file in "${BASEDIR}/lfs/"*; do @@ -1109,15 +1109,18 @@ download_sources() { # Download and check the package if ! make_pkg "${pkg}" download b2; then + failed_packages+=( "${pkg}" ) print_status FAIL - status=1 continue fi print_status DONE done - return "${status}" + # Fail if we could not download/verify all packages + if [ "${#failed_packages[@]}" -gt 0 ]; then + exiterror "Failed to download or verify some packages: ${failed_packages[@]}" + fi } # Download the toolchain @@ -2342,9 +2345,7 @@ downloadsrc) print_headline "Pre-loading all source files" # Download all sources - if ! download_sources; then - exiterror "Failed to download sources" - fi + download_sources ;; toolchain) # Launch in a new namespace -- 2.47.3