diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2024-11-04 12:50:54 -0800 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2024-11-04 12:50:54 -0800 |
| commit | 6648a0d37131534767f15542f1d2efc3d7201f55 (patch) | |
| tree | 9432d08c8c617e6d7ad9c77c7f4684f4de7a890b | |
| parent | Fix deprecated datetime.datetime.utcnow() usage (diff) | |
| download | portage-6648a0d37131534767f15542f1d2efc3d7201f55.tar.gz portage-6648a0d37131534767f15542f1d2efc3d7201f55.tar.bz2 portage-6648a0d37131534767f15542f1d2efc3d7201f55.zip | |
install_qa_check: Fix noclean interaction with merge-wait
Fixes: 8ac72ee300c1 ("install_qa_check: prematurely delete WORKDIR if FEATURES=merge-wait")
Bug: https://bugs.gentoo.org/942760
Signed-off-by: Zac Medico <zmedico@gentoo.org>
| -rw-r--r-- | NEWS | 2 | ||||
| -rwxr-xr-x | bin/misc-functions.sh | 4 |
2 files changed, 5 insertions, 1 deletions
@@ -14,6 +14,8 @@ Bug fixes: * gpkg: do not consider symlinks targets for size estimation (bug #942512). +* install_qa_check: Fix noclean interaction with merge-wait (bug #942760). + portage-3.0.66.1 (2024-09-18) -------------- diff --git a/bin/misc-functions.sh b/bin/misc-functions.sh index e7ca2a8a9..386e50cc8 100755 --- a/bin/misc-functions.sh +++ b/bin/misc-functions.sh @@ -259,7 +259,9 @@ install_qa_check() { # 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 + if has merge-wait ${FEATURES} && + ! has keepwork ${FEATURES} && + ! has noclean ${FEATURES} ; then rm -rf "${WORKDIR}" fi } |