From 847bee79d77df86299bb5ac909b15b22ad221bd7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lucio=20Andr=C3=A9s=20Illanes=20Albornoz?= Date: Thu, 19 Mar 2020 11:44:23 +0000 Subject: subr/{pkg_install,rtl_fetch}.subr, subr/rtl_complex.subr:rtl_flock_acquire(): split. --- subr/pkg_install.subr | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) (limited to 'subr/pkg_install.subr') diff --git a/subr/pkg_install.subr b/subr/pkg_install.subr index 8a033572..ef3fed28 100644 --- a/subr/pkg_install.subr +++ b/subr/pkg_install.subr @@ -22,17 +22,8 @@ pkg_install() { return 1; fi; done; IFS="${_ifs_old}"; - (set +o errexit -o noglob; trap "rm -f \"${BUILD_WORKDIR}/install.lock\"" EXIT; - date; - while true; do - if flock -E 622 -w 600 4; then - break; - elif [ "${?}" -eq 622 ]; then - continue; - else - exit "${?}"; - fi; - done; + (set +o errexit -o noglob; rtl_flock_acquire 4 || exit "${?}"; date; + trap "rm -f \"${BUILD_WORKDIR}/install.lock\"" EXIT; if ! tar -C "${PKG_DESTDIR}" -cpf - . | tar -C "${PKG_PREFIX}" --overwrite -xpf -; then exit 1; fi) 4<>"${BUILD_WORKDIR}/install.lock"; -- cgit v1.2.3