commit: 1223086a043483c15700dd7781f1710b05c4c86c
Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 15 04:20:01 2024 +0000
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Fri Mar 15 04:22:02 2024 +0000
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=1223086a
bin/ebuild: Discard merge-wait from FEATURES
We don't implement merge-wait for the ebuild command, so discard
it from FEATURES. This prevents premature WORKDIR removal.
Fixes: 8eb2502bf264 ("phase-functions: prematurely delete WORKDIR if
FEATURES=merge-wait")
Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>
bin/ebuild | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/bin/ebuild b/bin/ebuild
index 69db474c0b..043e5bc476 100755
--- a/bin/ebuild
+++ b/bin/ebuild
@@ -304,6 +304,10 @@ def main():
tmpsettings.features.discard("fail-clean")
+ # We don't implement merge-wait for the ebuild command, so discard
+ # it from FEATURES. This prevents premature WORKDIR removal.
+ tmpsettings.features.discard("merge-wait")
+
if "merge" in pargs and "noauto" in tmpsettings.features:
print("Disabling noauto in features... merge disables it. (qmerge
doesn't)")
tmpsettings.features.discard("noauto")
