From 221ee9ab8f7be62b3bf1adf14e406d138a96ac08 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lucio=20Andr=C3=A9s=20Illanes=20Albornoz?= Date: Mon, 2 Mar 2020 11:03:47 +0000 Subject: build.sh:build(): iteratively print list of unknown packages, if any. subr/build_init.subr:buildp_init_args(): correctly parse -r package[,...]:step[,...]. subr/ex_pkg{,_dispatch}.subr: minor cleanup. subr/ex_pkg_dispatch.subr:ex_pkg_dispatch(): don't reset ${EX_PKG_DISPATCH_UNKNOWN} on entry. subr/ex_pkg_dispatch.subr:ex_pkg_dispatch(): correctly check ${_pkg_names} for ${_pkg_name} when updating ${EX_PKG_DISPATCH_UNKNOWN}. --- build.sh | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'build.sh') diff --git a/build.sh b/build.sh index f3e5a2ba..f34025ef 100755 --- a/build.sh +++ b/build.sh @@ -91,8 +91,8 @@ buildp_dispatch() { }; build() { - local _build_time_hours=0 _build_time_mins=0 _build_time_secs=0 \ - BUILD_DATE_START="" BUILD_NFAIL=0 BUILD_NFINI=0 BUILD_NSKIP=0 \ + local _build_time_hours=0 _build_time_mins=0 _build_time_secs=0 _pkg_name="" \ + BUILD_DATE_START="" BUILD_NFAIL=0 BUILD_NFINI=0 BUILD_NSKIP=0 \ BUILD_PKGS_FAILED="" EX_PKG_DISPATCH_UNKNOWN=""; if trap "buildp_ast abort" HUP INT TERM USR1 USR2\ && trap "buildp_ast exit" EXIT\ @@ -104,7 +104,9 @@ build() { buildp_dispatch "${BUILD_GROUPS}" "${ARG_PARALLEL:-1}" \ "${BUILD_WORKDIR}/build.fifo" "${ARG_RESTART}" \ "${ARG_RESTART_AT}" "${ARG_RESTART_RECURSIVE}" "${BUILD_WORKDIR}"; then - rtl_log_msg failexit "Error: package \`${EX_PKG_DISPATCH_UNKNOWN}' unknown."; + for _pkg_name in ${EX_PKG_DISPATCH_UNKNOWN}; do + rtl_log_msg fail "Error: package \`${_pkg_name}' unknown."; + done; exit 1; else : $((_build_time_secs=$(rtl_date %s)-${_build_time_secs})); : $((_build_time_hours=${_build_time_secs}/3600)); : $((_build_time_minutes=(${_build_time_secs}%3600)/60)); -- cgit v1.2.3