From bf9edfaed49c4387e181be454602e0cc65fe4382 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lucio=20Andr=C3=A9s=20Illanes=20Albornoz?= Date: Sun, 1 Mar 2020 21:09:37 +0000 Subject: General cleanup, pt. III. dist/dist_digest.dist: removes obsolete dist file. etc/{build.usage,README.md}: updated. groups/000.host_tools.group:{autoconf,automake,gettext_tiny,install_strip,libtool,m4}_host: moved from groups/010.host_deps.group. groups/221.native_packages_dev.group:lua: moved from groups/231.native_packages_etc.group. groups/221.native_packages_dev.group:lua:${PKG_FORCE_AUTORECONF}: set. groups/231.native_packages_etc.group:{mlogin,tdnf}:${PKG_FORCE_AUTORECONF}: set. groups/241.native_packages_inet.group:nullmailer:${PKG_FORCE_AUTORECONF}: set. groups/251.native_packages_lib.group:lib{asr,gpg_error}:${PKG_FORCE_AUTORECONF}: set. midipix.env, etc/README.md, subr/pkg_configure_autotools.subr: adds FORCE_NO_AUTORECONF. subr/rtl_fileop.subr: adds ch{mod,own} fileops. vars/{check_updates,jamvm,lib{asr,gpg_error},lua,mlogin,tdnf}.vars: removes obsolete vars file. --- subr/ex_pkg_exec.subr | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'subr/ex_pkg_exec.subr') diff --git a/subr/ex_pkg_exec.subr b/subr/ex_pkg_exec.subr index 6fb333bb..9e4629ba 100644 --- a/subr/ex_pkg_exec.subr +++ b/subr/ex_pkg_exec.subr @@ -22,11 +22,11 @@ exp_pkg_exec_pre() { if [ "${PKG_NO_CLEAN_BASE_DIR:-0}" -eq 0 ]\ && ! rtl_fileop rm "${PKG_BASE_DIR}" "${PKG_BUILD_DIR}" "${PKG_DESTDIR}"\ || ! rtl_fileop mkdir "${PKG_BASE_DIR}"; then - return "${?}"; + return 1; fi; if ! rtl_fileop mkdir "${PKG_BUILD_DIR}" "${PKG_DESTDIR}"\ || ! ex_pkg_state_set "${_pkg_name}" "start"; then - return "${?}"; + return 1; fi; fi; rtl_fileop cd "${PKG_BUILD_DIR}"; @@ -97,9 +97,11 @@ ex_pkg_exec() { fi; done; fi; - if [ "${_rc:-0}" -eq 0 ]\ - && [ -z "${_restart_at}" ]; then - ex_pkg_state_set "${_pkg_name}" finish; + if [ "${_rc:-0}" -eq 0 ]; then + if [ -z "${_restart_at}" ]\ + || [ "${_restart_at}" = "ALL" ]; then + ex_pkg_state_set "${_pkg_name}" finish; + fi; fi; fi; return "${_rc}"; -- cgit v1.2.3