Gentoo Archives: gentoo-commits

From: Richard Farina <zerochaos@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/catalyst:master commit in: targets/support/
Date: Mon, 31 Aug 2015 03:36:09
Message-Id: 1440992164.487f1e94217c6a64b770a3f32d942eb613159be0.zerochaos@gentoo
1 commit: 487f1e94217c6a64b770a3f32d942eb613159be0
2 Author: Rick Farina (Zero_Chaos) <zerochaos <AT> gentoo <DOT> org>
3 AuthorDate: Mon Aug 31 03:36:04 2015 +0000
4 Commit: Richard Farina <zerochaos <AT> gentoo <DOT> org>
5 CommitDate: Mon Aug 31 03:36:04 2015 +0000
6 URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=487f1e94
7
8 fix USE="$USE $1" showing up in make.conf
9
10 targets/support/chroot-functions.sh | 8 ++++----
11 1 file changed, 4 insertions(+), 4 deletions(-)
12
13 diff --git a/targets/support/chroot-functions.sh b/targets/support/chroot-functions.sh
14 index 95904b3..253eee2 100755
15 --- a/targets/support/chroot-functions.sh
16 +++ b/targets/support/chroot-functions.sh
17 @@ -172,12 +172,12 @@ setup_pkgmgr(){
18 # Use --update or portage might just waste time/cycles and reinstall the same version.
19 # Use --newuse to make sure it rebuilds with any changed use flags.
20 if [ -n "$1" ];then
21 - echo "Adding USE='${USE} $1' to make.conf for portage build"
22 - [ -e ${clst_make_conf} ] && echo 'USE="${USE} $1"' >> ${clst_make_conf}
23 + echo "Adding USE=\"${USE} $1\" to make.conf for portage build"
24 + [ -e "${clst_make_conf}" ] && echo "USE=\"${USE} $1\"" >> "${clst_make_conf}"
25 run_merge --oneshot --update --newuse sys-apps/portage
26 - sed -i '/USE="${USE} $1"/d' ${clst_make_conf}
27 + sed -i "/USE=\"${USE} $1\"/d" "${clst_make_conf}"
28 else
29 - echo "Updating portage with USE='${USE}'"
30 + echo "Updating portage with USE=\"${USE}\""
31 run_merge --oneshot --update --newuse sys-apps/portage
32 fi
33 }