| 1 |
commit: 92706a41fadbccf0a39af08ea2a52a2696c68603 |
| 2 |
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Mar 27 23:30:10 2020 +0000 |
| 4 |
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Mar 28 07:39:59 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=92706a41 |
| 7 |
|
| 8 |
targets: Fix setting FEATURES="clean-logs" |
| 9 |
|
| 10 |
This likely fixes a bug in 8ca52570aa2d ("keep logs outside of chroot") |
| 11 |
that would have prevented any logs (except for those from |
| 12 |
dev-util/ccache, sys-devel/distcc, and sys-devel/icecream) from being |
| 13 |
kept, since "clean-logs" was added to FEATURES in the wrong place. |
| 14 |
|
| 15 |
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> |
| 16 |
|
| 17 |
targets/support/chroot-functions.sh | 5 +++-- |
| 18 |
1 file changed, 3 insertions(+), 2 deletions(-) |
| 19 |
|
| 20 |
diff --git a/targets/support/chroot-functions.sh b/targets/support/chroot-functions.sh |
| 21 |
index 05f311cf..8996119c 100755 |
| 22 |
--- a/targets/support/chroot-functions.sh |
| 23 |
+++ b/targets/support/chroot-functions.sh |
| 24 |
@@ -78,7 +78,8 @@ get_libdir() { |
| 25 |
|
| 26 |
setup_myfeatures(){ |
| 27 |
setup_myemergeopts |
| 28 |
- export FEATURES="-news clean-logs" |
| 29 |
+ export clst_myfeatures="-news clean-logs" |
| 30 |
+ export FEATURES="${clst_myfeatures}" |
| 31 |
if [ -n "${clst_CCACHE}" ] |
| 32 |
then |
| 33 |
export clst_myfeatures="${clst_myfeatures} ccache" |
| 34 |
@@ -132,7 +133,7 @@ setup_myfeatures(){ |
| 35 |
export PATH="/usr/lib/icecc/bin:${PATH}" |
| 36 |
export PREROOTPATH="/usr/lib/icecc/bin" |
| 37 |
fi |
| 38 |
- export FEATURES="${clst_myfeatures} -news" |
| 39 |
+ export FEATURES="${clst_myfeatures}" |
| 40 |
} |
| 41 |
|
| 42 |
setup_myemergeopts(){ |
Archives