[gentoo-commits] proj/portage:master commit in: bin/, /

["Zac Medico" <zmedico@gentoo.org>]

commit:     6648a0d37131534767f15542f1d2efc3d7201f55
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Mon Nov  4 20:50:54 2024 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Mon Nov  4 20:50:54 2024 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=6648a0d3

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 <AT> gentoo.org>

 NEWS                  | 2 ++
 bin/misc-functions.sh | 4 +++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/NEWS b/NEWS
index 8847f02098..ac0741d953 100644
--- a/NEWS
+++ b/NEWS
@@ -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 e7ca2a8a92..386e50cc8d 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
 }