diff options
| author |   Douglas Freed <dwfreed@mtu.edu> | 2013-05-28 16:20:30 -0400 |
|---|---|---|
| committer |   Rick Farina (Zero_Chaos) <zerochaos@gentoo.org> | 2013-05-28 16:20:30 -0400 |
| commit | 8324fc2ccaa796d6ba06e00d33facc6392d6b811 (patch) | |
| tree | 948c5cb64f264788c803548f67ae335c87a9b5dc | |
| parent | proper lbzip2 decompression of stages (diff) | |
| download | catalyst-8324fc2ccaa796d6ba06e00d33facc6392d6b811.tar.gz catalyst-8324fc2ccaa796d6ba06e00d33facc6392d6b811.tar.bz2 catalyst-8324fc2ccaa796d6ba06e00d33facc6392d6b811.zip | |
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>
| -rw-r--r-- | targets/support/chroot-functions.sh | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/targets/support/chroot-functions.sh b/targets/support/chroot-functions.sh index 0705b5b6..cacf5f89 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" |