summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorLucio Andrés Illanes Albornoz <lucio@lucioillanes.de>2020-02-11 17:52:24 +0000
committerLucio Andrés Illanes Albornoz <lucio@lucioillanes.de>2020-02-11 17:52:24 +0000
commit25e5b6590a978310f81d84c448e47776ea6e4ebd (patch)
tree3ad47aa656ce6f8495c3a431cda4a9b628e92c97
parenta5a093a014454eeb65f958fdd2df3c4b371fcbf0 (diff)
downloadmidipix_build-25e5b6590a978310f81d84c448e47776ea6e4ebd.tar.bz2
midipix_build-25e5b6590a978310f81d84c448e47776ea6e4ebd.tar.xz
subr/ex_pkg_dispatch.subr: correctly update ${_pkg_names}.
-rw-r--r--subr/ex_pkg_dispatch.subr4
1 files changed, 3 insertions, 1 deletions
diff --git a/subr/ex_pkg_dispatch.subr b/subr/ex_pkg_dispatch.subr
index 236e9aaf..860361cc 100644
--- a/subr/ex_pkg_dispatch.subr
+++ b/subr/ex_pkg_dispatch.subr
@@ -29,7 +29,6 @@ exp_pkg_dispatch_group() {
"${_pkg_name}" "${_restart_at}" "${_stderrout_path}" \
"${_pipe_path}"; then
_pkgs_found_new="${_pkgs_found_new:+${_pkgs_found_new} }${_pkg_name}";
- _pkg_names="$(ex_rtl_lfilter "${_pkg_names}" "${_pkg_name}")";
break;
fi;
done;
@@ -42,10 +41,12 @@ exp_pkg_dispatch_package() {
_pkg_name_uc="$(ex_rtl_toupper "${_pkg_name}")";
if [ -n "$(ex_rtl_get_var_unsafe PKG_${_pkg_name_uc}_DISABLED)" ]; then
_pkgs_complete="${_pkgs_complete:+${_pkgs_complete} }${_pkg_name}"; _rc=1;
+ _pkg_names="$(ex_rtl_lfilter "${_pkg_names}" "${_pkg_name}")";
"${_dispatch_fn}" disabled_pkg "${_group_name}" "${_pkg_name}";
elif ex_pkg_state_test "${_pkg_name}" finish\
&& [ -z "${_restart_at}" ]; then
_pkgs_complete="${_pkgs_complete:+${_pkgs_complete} }${_pkg_name}"; _rc=1;
+ _pkg_names="$(ex_rtl_lfilter "${_pkg_names}" "${_pkg_name}")";
"${_dispatch_fn}" skipped_pkg "${_group_name}" "${_pkg_name}";
else
_pkgs_wait="${_pkgs_wait:+${_pkgs_wait} }${_pkg_name}";
@@ -102,6 +103,7 @@ ex_pkg_dispatch() {
case "${_pipe_msg%% *}" in
done) "${_dispatch_fn}" finish_pkg ${_pipe_msg#done }; _pkg_name="${_pipe_msg#done * }"; : $((_njobs-=1));
_pkgs_complete="${_pkgs_complete:+${_pkgs_complete} }${_pkg_name}";
+ _pkg_names="$(ex_rtl_lfilter "${_pkg_names}" "${_pkg_name}")";
_pkgs_wait="$(ex_rtl_lfilter "${_pkgs_wait}" "${_pkg_name}")";
if [ "${_script_rc:-0}" -eq 0 ]; then
exp_pkg_dispatch_group;