From 196f004d57a260e3fbd27e614b079337c141b813 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luc=C3=ADa=20Andrea=20Illanes=20Albornoz?= Date: Fri, 31 Mar 2023 07:36:41 +0200 Subject: subr.ex/ex_pkg_exec.subr: pass @_dispatch_fn to exp_pkg_exec_pre(). --- subr.ex/ex_pkg_exec.subr | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/subr.ex/ex_pkg_exec.subr b/subr.ex/ex_pkg_exec.subr index d64d8159..e2b3ba0d 100644 --- a/subr.ex/ex_pkg_exec.subr +++ b/subr.ex/ex_pkg_exec.subr @@ -5,6 +5,7 @@ # # exp_pkg_exec_pre() - prepare environment for single named package w/ dispatcher +# @_dispatch_fn: top-level dispatch function name # @_group_name: build group name # @_pkg_name: single package name # @_restart_at: optional comma-separated list of build steps at which to rebuild or ALL or LAST @@ -13,7 +14,8 @@ # Returns: zero (0) on success, non-zero (>0) on failure # exp_pkg_exec_pre() { - local _eppep_group_name="${1}" _eppep_pkg_name="${2}" _eppep_restart_at="${3}" _eppep_workdir="${4}"; + local _eppep_dispatch_fn="${1}" _eppep_group_name="${2}" _eppep_pkg_name="${3}" \ + _eppep_restart_at="${4}" _eppep_workdir="${5}"; if [ "${PKG_URL:+1}" != 1 ]\ && [ "${PKG_URLS_GIT:+1}" != 1 ]\ @@ -104,10 +106,11 @@ exp_pkg_exec() { _eppe_build_step_last="" _eppe_rc=0 _eppe_step=""; if ! exp_pkg_exec_pre \ + "${_eppe_dispatch_fn}" \ "${_eppe_group_name}" "${_eppe_pkg_name}" \ - "${_eppe_restart_at}" "${_eppe_workdir}"\ - || ! "${_eppe_dispatch_fn}" \ - start_pkg_child "${_eppe_group_name}" \ + "${_eppe_restart_at}" "${_eppe_workdir}" \ + || ! "${_eppe_dispatch_fn}" \ + start_pkg_child "${_eppe_group_name}" \ "${_eppe_pkg_name}"; then _eppe_rc=1; -- cgit v1.2.3