diff options
| author |   Matt Turner <mattst88@gentoo.org> | 2020-03-27 16:30:10 -0700 |
|---|---|---|
| committer | Matt Turner <mattst88@gentoo.org> | 2020-05-19 09:01:22 -0700 |
| commit | 59372814daeb98cda5099a90571c61202b90dce6 (patch) | |
| tree | 9aaa6c9258c9a8192f4ec99ce0fc48d59ee93303 | |
| parent | catalyst 3.0.11 (diff) | |
| download | catalyst-59372814daeb98cda5099a90571c61202b90dce6.tar.gz catalyst-59372814daeb98cda5099a90571c61202b90dce6.tar.bz2 catalyst-59372814daeb98cda5099a90571c61202b90dce6.zip | |
targets: Fix setting FEATURES="clean-logs"
This likely fixes a bug in 8ca52570aa2d ("keep logs outside of chroot")
that would have prevented any logs (except for those from
dev-util/ccache, sys-devel/distcc, and sys-devel/icecream) from being
kept, since "clean-logs" was added to FEATURES in the wrong place.
Signed-off-by: Matt Turner <mattst88@gentoo.org>
(cherry picked from commit 92706a41fadbccf0a39af08ea2a52a2696c68603)
| -rwxr-xr-x | targets/support/chroot-functions.sh | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/targets/support/chroot-functions.sh b/targets/support/chroot-functions.sh index 1dfd3277..f3727d06 100755 --- a/targets/support/chroot-functions.sh +++ b/targets/support/chroot-functions.sh @@ -78,7 +78,8 @@ get_libdir() { setup_myfeatures(){ setup_myemergeopts - export FEATURES="-news binpkg-multi-instance clean-logs" + export clst_myfeatures="-news binpkg-multi-instance clean-logs" + export FEATURES="${clst_myfeatures}" if [ -n "${clst_CCACHE}" ] then export clst_myfeatures="${clst_myfeatures} ccache" @@ -132,7 +133,7 @@ setup_myfeatures(){ export PATH="/usr/lib/icecc/bin:${PATH}" export PREROOTPATH="/usr/lib/icecc/bin" fi - export FEATURES="${clst_myfeatures} -news" + export FEATURES="${clst_myfeatures}" } setup_myemergeopts(){ |