diff options
| author | Lucio Andrés Illanes Albornoz <lucio@lucioillanes.de> | 2020-02-14 19:42:07 +0000 |
|---|---|---|
| committer | Lucio Andrés Illanes Albornoz <lucio@lucioillanes.de> | 2020-02-14 22:37:53 +0000 |
| commit | 70fe0dc21adeb09bab3bd25ded1203533dd1e5e8 (patch) | |
| tree | 3324e4156f6e14d8c488b3eb3d194d31126bed06 /subr/ex_pkg_dispatch.subr | |
| parent | 2f537c1e2eff74cb44682dada4394c938b9e226c (diff) | |
| download | midipix_build-70fe0dc21adeb09bab3bd25ded1203533dd1e5e8.tar.bz2 midipix_build-70fe0dc21adeb09bab3bd25ded1203533dd1e5e8.tar.xz | |
groups/2*.native_packages_*.group: adds dependencies.
subr/ex_pkg_dispatch.subr:exp_pkg_dispatch_{group,package}(): correctly register {disabled,skipped} packages in ${_pkgs_found}.
Diffstat (limited to 'subr/ex_pkg_dispatch.subr')
| -rw-r--r-- | subr/ex_pkg_dispatch.subr | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/subr/ex_pkg_dispatch.subr b/subr/ex_pkg_dispatch.subr index e2e7e1b0..89396ec7 100644 --- a/subr/ex_pkg_dispatch.subr +++ b/subr/ex_pkg_dispatch.subr @@ -40,19 +40,19 @@ exp_pkg_dispatch_group() { exp_pkg_dispatch_package() { local _dispatch_fn="${1}" _group_name="${2}" _pkg_name="${3}" _restart="${4}" _restart_at="${5}" \ - _stderrout_path="${6}" _pipe_path="${7}" _pkg_name_uc="" _rc=0; + _stderrout_path="${6}" _pipe_path="${7}" _pkg_name_uc=""; _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}"; _pkg_names="$(ex_rtl_lfilter "${_pkg_names}" "${_pkg_name}")"; - : $((_pkgs_count+=1)); _rc=1; + : $((_pkgs_count+=1)); "${_dispatch_fn}" disabled_pkg "${_group_name}" "${_pkg_name}" "${_pkgs_count}" "${_pkgs_count_max}"; elif ex_pkg_state_test "${_pkg_name}" finish\ && [ -z "$(ex_rtl_lsearch "${_restart}" "${_pkg_name}")" ]\ && [ "${ARG_RESTART_RECURSIVE:-0}" -ne 2 ]; then _pkgs_complete="${_pkgs_complete:+${_pkgs_complete} }${_pkg_name}"; _pkg_names="$(ex_rtl_lfilter "${_pkg_names}" "${_pkg_name}")"; - : $((_pkgs_count+=1)); _rc=1; + : $((_pkgs_count+=1)); "${_dispatch_fn}" skipped_pkg "${_group_name}" "${_pkg_name}" "${_pkgs_count}" "${_pkgs_count_max}"; else : $((_pkgs_count+=1)); _pkgs_wait="${_pkgs_wait:+${_pkgs_wait} }${_pkg_name}"; @@ -64,7 +64,6 @@ exp_pkg_dispatch_package() { "${_dispatch_fn}";) 1>"${_stderrout_path}" 2>&1 3>"${_pipe_path}" & : $((_njobs+=1)); fi; - return "${_rc}"; }; exp_pkg_expand_packages() { |