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 A47451381F3 for ; Tue, 28 May 2013 20:20:33 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 15F26E0A6A; Tue, 28 May 2013 20:20:31 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id AF686E0A6A for ; Tue, 28 May 2013 20:20:30 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C37B333E140 for ; Tue, 28 May 2013 20:20:29 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 5609DE4402 for ; Tue, 28 May 2013 20:20:28 +0000 (UTC) From: "Richard Farina" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Richard Farina" Message-ID: <1369772430.8324fc2ccaa796d6ba06e00d33facc6392d6b811.zerochaos@gentoo> Subject: [gentoo-commits] proj/catalyst:master 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: zerochaos X-VCS-Committer-Name: Richard Farina X-VCS-Revision: 8324fc2ccaa796d6ba06e00d33facc6392d6b811 X-VCS-Branch: master Date: Tue, 28 May 2013 20:20:28 +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: da6574a4-cf7c-4e3b-8852-b2948bfdaa9a X-Archives-Hash: 8fb962a72787453cdc5b012d37829ef4 commit: 8324fc2ccaa796d6ba06e00d33facc6392d6b811 Author: Douglas Freed mtu edu> AuthorDate: Tue May 28 20:20:30 2013 +0000 Commit: Richard Farina gentoo org> CommitDate: Tue May 28 20:20:30 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=8324fc2c Fixes a bug inadvertently caused by 6c0a577 where setting update_seed to no would result in dropping the use and making of binpkgs while building stage1, which is undesirable. The conditional was getting a bit unwieldly, so I added a comment explaining when it matches, which is especially helpful to those who don't know every single test flag. Tested-By: Rick Farina gentoo.org> Tested-By: Brian Dolbec gentoo.org> --- targets/support/chroot-functions.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/targets/support/chroot-functions.sh b/targets/support/chroot-functions.sh index 0705b5b..cacf5f8 100644 --- a/targets/support/chroot-functions.sh +++ b/targets/support/chroot-functions.sh @@ -133,7 +133,8 @@ setup_myemergeopts(){ then export bootstrap_opts="${bootstrap_opts} -f" export clst_myemergeopts="${clst_myemergeopts} -f" - elif [ -n "${clst_PKGCACHE}" -a -z "${clst_update_seed}" ] + # if we have PKGCACHE, and either update_seed is empty or 'no', make and use binpkgs + elif [ -n "${clst_PKGCACHE}" ] && [ -z "${clst_update_seed}" -o "${clst_update_seed}" = "no" ] then export clst_myemergeopts="${clst_myemergeopts} --usepkg --buildpkg --newuse" export bootstrap_opts="${bootstrap_opts} -r"