From 4a5da5254e1207686f492e7ce8759c80466185f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lucio=20Andr=C3=A9s=20Illanes=20Albornoz?= Date: Tue, 25 Feb 2020 22:31:28 +0000 Subject: build.sh: reintroduce {disabled,skipped}_pkg messages at -v[v[v]]. build.sh, subr/build_init.subr: minor cleanup. subr/ex_pkg_dispatch.subr:exp_pkg_expand_packages(): call ${_dispatch_fn} w/ {disabled,skipped}_pkg for {disabled,skipped} packages. subr/ex_pkg_dispatch.subr:exp_pkg_expand_packages(): don't mutate ${EX_PKG_NSKIPPED}. subr/ex_pkg_dispatch.subr:ex_pkg_dispatch(): don't set ${EX_PKG_NSKIPPED}. --- subr/build_init.subr | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'subr/build_init.subr') diff --git a/subr/build_init.subr b/subr/build_init.subr index 870128ba..a52ff5ff 100644 --- a/subr/build_init.subr +++ b/subr/build_init.subr @@ -40,11 +40,9 @@ buildp_init_args() { fi; fi; ex_rtl_log_set_vnfo_lvl "${ARG_VERBOSE:-0}"; - BUILD_IS_PARENT=1; - BUILD_DATE_START="$(ex_rtl_date %Y-%m-%d-%H-%M-%S)"; - BUILD_NFINI="${BUILD_NSKIP:=${BUILD_NFAIL:=${BUILD_NBUILT:=0}}}"; - BUILD_PKGS_FAILED=""; - BUILD_TIMES_SECS="$(ex_rtl_date %s)"; + BUILD_DATE_START="$(ex_rtl_date %Y-%m-%d-%H-%M-%S)"; BUILD_IS_PARENT=1; + BUILD_NFAIL="${BUILD_NFINI:=${BUILD_NSKIP:=0}}"; + BUILD_PKGS_FAILED=""; BUILD_TIMES_SECS="$(ex_rtl_date %s)"; if [ "${ARG_FETCH_FORCE}" = "ipv4" ]; then DEFAULT_GIT_ARGS="-4${DEFAULT_GIT_ARGS:+ ${DEFAULT_GIT_ARGS}}"; DEFAULT_WGET_ARGS="-4${DEFAULT_WGET_ARGS:+ ${DEFAULT_WGET_ARGS}}"; -- cgit v1.2.3