From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 3F4F61382C5 for ; Wed, 20 May 2020 03:43:18 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 82A7AE0919; Wed, 20 May 2020 03:43:17 +0000 (UTC) Received: from mail-pf1-f193.google.com (mail-pf1-f193.google.com [209.85.210.193]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 7B252E0919 for ; Wed, 20 May 2020 03:43:17 +0000 (UTC) Received: by mail-pf1-f193.google.com with SMTP id z26so897455pfk.12 for ; Tue, 19 May 2020 20:43:17 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=0MBJzX3IXetSJBEKcbk3/qzuHabqvWRYDDzXRzs090w=; b=tbFsJ1U1rqlQ7sjyGP8p2eAlII+aSEk/r7x4t+/voVwem6NohRRarkxF4dPXKqOqMs tp+/f3G/Yys4sNMuEOZccia4LRoBwxCH2fSPE92/vPFhYSCFqsniUUFNuJbSP/oq5CvQ mrsD9ouObRMt1dQjfT3kGI+O/psMLM059IHTAFWKOCBIBsb7qO5KNT1mGx8f/OYU3U74 Bf5LNKQxNAvR2DUOQqh7liQmiO1G7v/8fFN5jA6541/aRRnQR/YjEMQPESJWFDMnkY2v ZQWUWTyTm6dh3vHiH9SJqOyOSlc0RtSuFbD47TDDahnP/LO9sz6N7B+ogSwGNOf0vBtz n/SA== X-Gm-Message-State: AOAM53014rto4humgSrRQIG01n8SPcgc4b4Mc2qRacFUXyrC9fPa7iQc 4Qc7hwOo2hbR0yhraaWz1JcBA/Wh X-Google-Smtp-Source: ABdhPJyL1ykd/8NqvUAbCEDjSy5gd5NLOVPbcxlfgwoyxi/vtqW3pf5lPt+JP7FTq6QYi7g1DfpauQ== X-Received: by 2002:a63:444a:: with SMTP id t10mr2234871pgk.149.1589946196040; Tue, 19 May 2020 20:43:16 -0700 (PDT) Received: from localhost ([134.134.137.77]) by smtp.gmail.com with ESMTPSA id c22sm761838pfc.127.2020.05.19.20.43.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 May 2020 20:43:15 -0700 (PDT) From: Matt Turner To: gentoo-catalyst@lists.gentoo.org Cc: Matt Turner Subject: [gentoo-catalyst] [PATCH 17/21] catalyst: Only emit true boolean envars Date: Tue, 19 May 2020 20:42:22 -0700 Message-Id: <20200520034226.2870937-17-mattst88@gentoo.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200520034226.2870937-1-mattst88@gentoo.org> References: <20200520034226.2870937-1-mattst88@gentoo.org> Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-catalyst@lists.gentoo.org Reply-to: gentoo-catalyst@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Archives-Salt: 80dcd1fe-9e95-43bc-9d42-64be5711b837 X-Archives-Hash: a1b38b2442e8abfee29899b009a433f4 Signed-off-by: Matt Turner --- 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 -- 2.26.2