From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id DDD7913835A for ; Sat, 16 May 2020 06:55:34 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 295E1E09E0; Sat, 16 May 2020 06:55:34 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 0D94EE09E0 for ; Sat, 16 May 2020 06:55:34 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 28D8134EDF6 for ; Sat, 16 May 2020 06:55:33 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8A6D824E for ; Sat, 16 May 2020 06:55:30 +0000 (UTC) From: "Matt Turner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Turner" Message-ID: <1589611791.76e00418920285d4899ecda1f3cf3edd93ead2e2.mattst88@gentoo> Subject: [gentoo-commits] proj/catalyst:wip/mattst88 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: mattst88 X-VCS-Committer-Name: Matt Turner X-VCS-Revision: 76e00418920285d4899ecda1f3cf3edd93ead2e2 X-VCS-Branch: wip/mattst88 Date: Sat, 16 May 2020 06:55:30 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: f709e330-d98d-472a-9cb5-6ad3884fc2fd X-Archives-Hash: 9675f7d6ba4385c935488b5ad736dda5 Message-ID: <20200516065530.t-ZpCNqHrBODp-zm_OL9U3UsHB3hU0c2bEJh4BRfvds@z> commit: 76e00418920285d4899ecda1f3cf3edd93ead2e2 Author: Matt Turner gentoo org> AuthorDate: Sat May 16 06:23:46 2020 +0000 Commit: Matt Turner gentoo org> CommitDate: Sat May 16 06:49:51 2020 +0000 URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=76e00418 targets: Decouple distfile fetching from binary packages This removes a hack introduced in 2006 to work around a bug in portage where it wouldn't fetch distfiles if a binary package existed for the package. Presumably that's been fixed in the intervening 14 years. See commit 4e00f1338637 (We now only set the options for pkgcache if we are not using fetchonly.) Also remove the useless "i++ // increment i"-style comment. Signed-off-by: Matt Turner gentoo.org> targets/support/chroot-functions.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/targets/support/chroot-functions.sh b/targets/support/chroot-functions.sh index 488041fe..d40279ae 100755 --- a/targets/support/chroot-functions.sh +++ b/targets/support/chroot-functions.sh @@ -152,8 +152,9 @@ setup_emerge_opts() { then emerge_opts+=(--fetchonly) bootstrap_opts+=(-f) - # 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" ] + fi + + if [ -n "${clst_PKGCACHE}" ] && [ -z "${clst_update_seed}" -o "${clst_update_seed}" = "no" ] then emerge_opts+=(--usepkg --buildpkg --binpkg-respect-use=y --newuse) bootstrap_opts+=(-r)