commit: 8ac72ee300c1e9a55f9c1ee96438e8f12d64dd20 Author: Zac Medico <zmedico <AT> gentoo <DOT> org> AuthorDate: Sun Mar 10 20:12:22 2024 +0000 Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> CommitDate: Sun Mar 10 20:12:22 2024 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=8ac72ee3
install_qa_check: prematurely delete WORKDIR if FEATURES=merge-wait Delay this until after the install qa hooks so that WORKDIR is accessible to these hooks: * bin/install-qa-check.d/90config-impl-decl * gentoo/metadata/install-qa-check.d/60python-tests Bug: https://github.com/gentoo/portage/pull/1302#issuecomment-1987303879 Fixes: 8eb2502bf264 ("phase-functions: prematurely delete WORKDIR if FEATURES=merge-wait") Signed-off-by: Zac Medico <zmedico <AT> gentoo.org> bin/misc-functions.sh | 7 +++++++ bin/phase-functions.sh | 7 ------- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/bin/misc-functions.sh b/bin/misc-functions.sh index 696f2a6133..e7ca2a8a92 100755 --- a/bin/misc-functions.sh +++ b/bin/misc-functions.sh @@ -255,6 +255,13 @@ install_qa_check() { "${PORTAGE_BIN_PATH}"/estrip --prepallstrip fi fi + + # Prematurely delete WORKDIR in case merge-wait is enabled to + # decrease the space used by portage build directories until the + # packages are merged and cleaned. + if has merge-wait ${FEATURES} && ! has keepwork ${FEATURES}; then + rm -rf "${WORKDIR}" + fi } __dyn_instprep() { diff --git a/bin/phase-functions.sh b/bin/phase-functions.sh index 9ff5554405..d037cf6776 100644 --- a/bin/phase-functions.sh +++ b/bin/phase-functions.sh @@ -724,13 +724,6 @@ __dyn_install() { >> DEBUGBUILD fi trap - SIGINT SIGQUIT - - # Prematurely delete WORKDIR in case merge-wait is enabled to - # decrease the space used by portage build directories until the - # packages are merged and cleaned. - if has merge-wait ${FEATURES} && ! has keepwork ${FEATURES}; then - rm -rf "${WORKDIR}" - fi } __dyn_help() {
