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 <zerochaos@gentoo.org>
Tested-By: Brian Dolbec <dolsen@gentoo.org>

diff --git a/targets/support/chroot-functions.sh b/targets/support/chroot-functions.sh
index 0705b5b63f92f35d1aaf92f835815d9d00c9edc4..cacf5f8914384faddf2dc35b498c90a844aceb93 100644 (file)
--- 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"