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 80E481383D3 for ; Tue, 1 Sep 2015 05:59:06 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C72F9142C4; Tue, 1 Sep 2015 05:59:02 +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 9C55914278 for ; Tue, 1 Sep 2015 05:59:01 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id DF3E03406F0 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 09CB1189 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: <1440992164.487f1e94217c6a64b770a3f32d942eb613159be0.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: 487f1e94217c6a64b770a3f32d942eb613159be0 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: b0ee0f85-fddc-4f08-9390-4cd681702786 X-Archives-Hash: e993420fa51709bb3131e7f5dbf0d7ca commit: 487f1e94217c6a64b770a3f32d942eb613159be0 Author: Rick Farina (Zero_Chaos) gentoo org> AuthorDate: Mon Aug 31 03:36:04 2015 +0000 Commit: Brian Dolbec gentoo org> CommitDate: Mon Aug 31 03:36:04 2015 +0000 URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=487f1e94 fix USE="$USE $1" showing up in make.conf targets/support/chroot-functions.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/targets/support/chroot-functions.sh b/targets/support/chroot-functions.sh index 95904b3..253eee2 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 }