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

[Matt Turner]

commit:     718a67fc8927ae28574182a0fe551e99ee6d66ce
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Wed May 20 02:22:11 2020 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Wed May 20 03:13:13 2020 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=718a67fc

catalyst: Only emit true boolean envars

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 catalyst/base/stagebase.py          | 2 --
 targets/support/chroot-functions.sh | 6 +++---
 targets/support/kmerge.sh           | 4 ++--
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py
index 8e2b08da..645a9f61 100644
--- a/catalyst/base/stagebase.py
+++ b/catalyst/base/stagebase.py
@@ -1283,8 +1283,6 @@ class StageBase(TargetBase, ClearBase, GenBase):
             elif isinstance(self.settings[x], bool):
                 if self.settings[x]:
                     self.env[varname] = "true"
-                else:
-                    self.env[varname] = "false"
             elif isinstance(self.settings[x], dict):
                 if x in ['compress_definitions', 'decompress_definitions']:
                     continue

diff --git a/targets/support/chroot-functions.sh 
b/targets/support/chroot-functions.sh
index b6e221af..b531eb6a 100755
--- a/targets/support/chroot-functions.sh
+++ b/targets/support/chroot-functions.sh
@@ -117,7 +117,7 @@ setup_emerge_opts() {
        emerge_opts=()
        bootstrap_opts=()
 
-       if [[ "${clst_VERBOSE}" == "true" ]]
+       if [ -n "${clst_VERBOSE}" ]
        then
                emerge_opts+=(--verbose)
                bootstrap_opts+=(-v)
@@ -256,7 +256,7 @@ run_merge() {
        export EPAUSE_IGNORE=0
        [[ $CONFIG_PROTECT != "-*"* ]] && export CONFIG_PROTECT="-*"
 
-       if [[ "${clst_VERBOSE}" == "true" ]]
+       if [ -n "${clst_VERBOSE}" ]
        then
                echo "ROOT=${ROOT} emerge ${emerge_opts[@]} -pt $@" || exit 1
                emerge ${emerge_opts[@]} -pt $@ || exit 3
@@ -268,7 +268,7 @@ run_merge() {
 }
 
 show_debug() {
-       if [ "${clst_DEBUG}" = "1" ]
+       if [ -n "${clst_DEBUG}" ]
        then
                unset PACKAGES
                echo "DEBUG:"

diff --git a/targets/support/kmerge.sh b/targets/support/kmerge.sh
index 6b589493..702c5454 100755
--- a/targets/support/kmerge.sh
+++ b/targets/support/kmerge.sh
@@ -58,7 +58,7 @@ setup_gk_args() {
                fi
        fi
 
-       if [[ "${clst_VERBOSE}" == "true" ]]
+       if [ -n "${clst_VERBOSE}" ]
        then
                GK_ARGS+=(--loglevel=2)
        fi
@@ -85,7 +85,7 @@ genkernel_compile(){
        esac
        # Build with genkernel using the set options
        # callback is put here to avoid escaping issues
-       if [[ "${clst_VERBOSE}" == "true" ]]
+       if [ -n "${clst_VERBOSE}" ]
        then
                gk_callback_opts=(-vN)
        else