From 4b9285c0f65773d49514742c2e60755262018496 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lucio=20Andr=C3=A9s=20Illanes=20Albornoz=20=28arab=2C=20vx?= =?UTF-8?q?p=29?= Date: Tue, 5 Dec 2017 15:53:58 +0000 Subject: subr/ex_pkg_dispatch.subr:ex_pkg_dispatch(): open FIFO in read/write mode to prevent EOF-related race conditions. subr/ex_pkg_exec.subr:ex_pkg_exec(): always dispatch finish for successfully built packages. --- subr/ex_pkg_dispatch.subr | 4 ++-- subr/ex_pkg_exec.subr | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/subr/ex_pkg_dispatch.subr b/subr/ex_pkg_dispatch.subr index 05c69b33..43d3fb60 100644 --- a/subr/ex_pkg_dispatch.subr +++ b/subr/ex_pkg_dispatch.subr @@ -80,8 +80,8 @@ ex_pkg_dispatch() { fail) _script_rc=1; "${_dispatch_fn}" fail_pkg ${_pipe_msg#fail }; [ $((_njobs-=1)) -eq 0 ] && break; ;; - step) "${_dispatch_fn}" step_pkg ${_pipe_msg#step }; - esac; done <"${_pipe_path}"; + step) "${_dispatch_fn}" step_pkg ${_pipe_msg#step }; ;; + esac; done <>"${_pipe_path}"; fi; ex_rtl_fileop rm "${_pipe_path}"; if [ "${_script_rc:-1}" -eq 1 ]; then diff --git a/subr/ex_pkg_exec.subr b/subr/ex_pkg_exec.subr index 4447008d..ceb9579a 100644 --- a/subr/ex_pkg_exec.subr +++ b/subr/ex_pkg_exec.subr @@ -53,9 +53,9 @@ ex_pkg_exec() { "${_dispatch_fn}" exec_step "${_pkg_name}" "${_tgt_name}" "${_step}"; ex_pkg_state_set "${_pkg_name}" "${_step}" "${1:+-${1}}"; done; - "${_dispatch_fn}" exec_finish "${_pkg_name}" "${_tgt_name}"; - ex_pkg_state_set "${_pkg_name}" finish; fi; + "${_dispatch_fn}" exec_finish "${_pkg_name}" "${_tgt_name}"; + ex_pkg_state_set "${_pkg_name}" finish; }; # vim:filetype=sh -- cgit v1.2.3