diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2024-03-14 21:20:01 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2024-03-14 21:22:02 -0700 |
| commit | 1223086a043483c15700dd7781f1710b05c4c86c (patch) | |
| tree | 6eb5a3abd1d77d55522cbe9f20d286a87f29e416 /bin | |
| parent | install_qa_check: prematurely delete WORKDIR if FEATURES=merge-wait (diff) | |
| download | portage-1223086a043483c15700dd7781f1710b05c4c86c.tar.gz portage-1223086a043483c15700dd7781f1710b05c4c86c.tar.bz2 portage-1223086a043483c15700dd7781f1710b05c4c86c.zip | |
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@gentoo.org>
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/ebuild | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/bin/ebuild b/bin/ebuild index 69db474c0..043e5bc47 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") |