From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 460171382C5 for ; Tue, 19 May 2020 16:20:32 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 647FEE085D; Tue, 19 May 2020 16:20:31 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 2F117E085D for ; Tue, 19 May 2020 16:20:31 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 04AA234F0C3 for ; Tue, 19 May 2020 16:20:08 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4EF7EAF for ; Tue, 19 May 2020 16:20:05 +0000 (UTC) From: "Matt Turner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Turner" Message-ID: <1589904082.59372814daeb98cda5099a90571c61202b90dce6.mattst88@gentoo> Subject: [gentoo-commits] proj/catalyst:catalyst-3.0-stable commit in: targets/support/ X-VCS-Repository: proj/catalyst X-VCS-Files: targets/support/chroot-functions.sh X-VCS-Directories: targets/support/ X-VCS-Committer: mattst88 X-VCS-Committer-Name: Matt Turner X-VCS-Revision: 59372814daeb98cda5099a90571c61202b90dce6 X-VCS-Branch: catalyst-3.0-stable Date: Tue, 19 May 2020 16:20:05 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: cd2112c7-93f6-427e-b16e-ae662a675120 X-Archives-Hash: 8c55b56d986e40c05abc782a01869347 commit: 59372814daeb98cda5099a90571c61202b90dce6 Author: Matt Turner gentoo org> AuthorDate: Fri Mar 27 23:30:10 2020 +0000 Commit: Matt Turner gentoo org> CommitDate: Tue May 19 16:01:22 2020 +0000 URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=59372814 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 gentoo.org> (cherry picked from commit 92706a41fadbccf0a39af08ea2a52a2696c68603) 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 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(){