commit:     92706a41fadbccf0a39af08ea2a52a2696c68603
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 27 23:30:10 2020 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sat Mar 28 07:39:59 2020 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=92706a41

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

 targets/support/chroot-functions.sh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/targets/support/chroot-functions.sh 
b/targets/support/chroot-functions.sh
index 05f311cf..8996119c 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 clean-logs"
+       export clst_myfeatures="-news 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(){

Reply via email to