From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 3CB371383DE for ; Tue, 1 Sep 2015 05:59:13 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3BD31142D9; Tue, 1 Sep 2015 05:59:03 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A49E41428A for ; Tue, 1 Sep 2015 05:59:01 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E613F34082B for ; Tue, 1 Sep 2015 05:59:00 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1A6F618A for ; Tue, 1 Sep 2015 05:58:57 +0000 (UTC) From: "Brian Dolbec" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Brian Dolbec" Message-ID: <1440992731.b2473eff92e64a13f87c1ba3c0628e3a7a75b5a3.dolsen@gentoo> Subject: [gentoo-commits] proj/catalyst:pending 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: dolsen X-VCS-Committer-Name: Brian Dolbec X-VCS-Revision: b2473eff92e64a13f87c1ba3c0628e3a7a75b5a3 X-VCS-Branch: pending Date: Tue, 1 Sep 2015 05:58:57 +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-Archives-Salt: 3c4825c1-1d62-41bf-bbad-ed35299587b4 X-Archives-Hash: 76ff0cfa25b84456ef237161eb9fc3b3 commit: b2473eff92e64a13f87c1ba3c0628e3a7a75b5a3 Author: Rick Farina (Zero_Chaos) gentoo org> AuthorDate: Mon Aug 31 03:45:31 2015 +0000 Commit: Brian Dolbec gentoo org> CommitDate: Mon Aug 31 03:45:31 2015 +0000 URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=b2473eff USE=${USE} gets parsed in bash instead of in make.conf, \${USE} prevents the expansion until it is already inside make.conf targets/support/chroot-functions.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/targets/support/chroot-functions.sh b/targets/support/chroot-functions.sh index 253eee2..4506eef 100755 --- a/targets/support/chroot-functions.sh +++ b/targets/support/chroot-functions.sh @@ -172,12 +172,12 @@ setup_pkgmgr(){ # Use --update or portage might just waste time/cycles and reinstall the same version. # Use --newuse to make sure it rebuilds with any changed use flags. if [ -n "$1" ];then - echo "Adding USE=\"${USE} $1\" to make.conf for portage build" - [ -e "${clst_make_conf}" ] && echo "USE=\"${USE} $1\"" >> "${clst_make_conf}" + echo "Adding USE=\"\${USE} $1\" to make.conf for portage build" + [ -e "${clst_make_conf}" ] && echo "USE=\"\${USE} $1\"" >> "${clst_make_conf}" run_merge --oneshot --update --newuse sys-apps/portage - sed -i "/USE=\"${USE} $1\"/d" "${clst_make_conf}" + sed -i "/USE=\"\${USE} $1\"/d" "${clst_make_conf}" else - echo "Updating portage with USE=\"${USE}\"" + echo "Updating portage with USE=\"\${USE}\"" run_merge --oneshot --update --newuse sys-apps/portage fi } @@ -270,7 +270,7 @@ run_merge() { export CONFIG_PROTECT="-*" # Set bindist USE flag if clst_BINDIST is set - [ -e ${clst_make_conf} ] && [ -n "${clst_BINDIST}" ] && echo "USE=\"${USE} bindist\"" >> ${clst_make_conf} + [ -e ${clst_make_conf} ] && [ -n "${clst_BINDIST}" ] && echo "USE=\"\${USE} bindist\"" >> ${clst_make_conf} if [ -n "${clst_VERBOSE}" ] then