[gentoo-commits] proj/catalyst:pending commit in: targets/tinderbox/, targets/support/, targets/stage2/

[gentoo-commits] proj/catalyst:pending commit in: targets/tinderbox/, targets/support/, targets/stage2/

[Brian Dolbec]

commit:     3566a26eb838d0924e9f7f3cec902674347ce272
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 24 06:53:57 2015 +0000
Commit:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Sat Oct 24 06:53:57 2015 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=3566a26e

targets: handle new clst_VERBOSE behavior

During the command line rewrite, the VERBOSE setting change from
set-if-true and unset-if-false to always being set, but to true/false.
Update the scripts to check for "true" now.

 targets/stage2/stage2-chroot.sh       | 5 -----
 targets/support/chroot-functions.sh   | 4 ++--
 targets/tinderbox/tinderbox-chroot.sh | 2 +-
 3 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/targets/stage2/stage2-chroot.sh b/targets/stage2/stage2-chroot.sh
index b426dab..6f69a62 100755
--- a/targets/stage2/stage2-chroot.sh
+++ b/targets/stage2/stage2-chroot.sh
@@ -5,11 +5,6 @@ source /tmp/chroot-functions.sh
 # Setup the environment
 export FEATURES="${clst_myfeatures} nodoc noman noinfo -news"
 
-if [ "${clst_VERBOSE}" ]
-then
-	/usr/portage/scripts/bootstrap.sh -p ${bootstrap_opts}
-fi
-
 # Set bindist USE flag if clst_BINDIST is set
 # The bindist functions have been taken from support/chroot-functions.sh
 if [ -e "${clst_make_conf}" ] && [ -n "${clst_BINDIST}" ]; then

diff --git a/targets/support/chroot-functions.sh b/targets/support/chroot-functions.sh
index fe40157..456ae4c 100755
--- a/targets/support/chroot-functions.sh
+++ b/targets/support/chroot-functions.sh
@@ -122,7 +122,7 @@ setup_myfeatures(){
 }
 
 setup_myemergeopts(){
-	if [ -n "${clst_VERBOSE}" ]
+	if [[ "${clst_VERBOSE}" == "true" ]]
 	then
 		clst_myemergeopts="--verbose"
 	else
@@ -284,7 +284,7 @@ run_merge() {
 	export EPAUSE_IGNORE=0
 	export CONFIG_PROTECT="-*"
 
-	if [ -n "${clst_VERBOSE}" ]
+	if [[ "${clst_VERBOSE}" == "true" ]]
 	then
 		echo "ROOT=${ROOT} emerge ${clst_myemergeopts} -pt $@" || exit 1
 		emerge ${clst_myemergeopts} -pt $@ || exit 3

diff --git a/targets/tinderbox/tinderbox-chroot.sh b/targets/tinderbox/tinderbox-chroot.sh
index 74e46d6..b93b4c1 100755
--- a/targets/tinderbox/tinderbox-chroot.sh
+++ b/targets/tinderbox/tinderbox-chroot.sh
@@ -12,7 +12,7 @@ rsync -avx --exclude "/root/" --exclude "/tmp/" --exclude "/usr/portage/" / \
 
 for x in ${clst_tinderbox_packages}
 do
-	if [ -n "${clst_VERBOSE}" ]
+	if [[ "${clst_VERBOSE}" == "true" ]]
 	then
 		run_merge --usepkg --buildpkg --newuse -vp $x
 	fi