[gentoo-commits] proj/catalyst:pending/mattst88 commit in: targets/support/

["Matt Turner" <mattst88@gentoo.org>]

commit:     76e00418920285d4899ecda1f3cf3edd93ead2e2
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Sat May 16 06:23:46 2020 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> 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 <mattst88 <AT> 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)