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 8F1941382C5 for ; Wed, 20 May 2020 03:40:03 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BB92BE088C; Wed, 20 May 2020 03:39:58 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 8D54AE088C for ; Wed, 20 May 2020 03:39:58 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 999D534F1EF for ; Wed, 20 May 2020 03:39:57 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id BF530267 for ; Wed, 20 May 2020 03:39:53 +0000 (UTC) From: "Matt Turner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Turner" Message-ID: <1589944393.718a67fc8927ae28574182a0fe551e99ee6d66ce.mattst88@gentoo> Subject: [gentoo-commits] proj/catalyst:pending/mattst88 commit in: catalyst/base/, targets/support/ X-VCS-Repository: proj/catalyst X-VCS-Files: catalyst/base/stagebase.py targets/support/chroot-functions.sh targets/support/kmerge.sh X-VCS-Directories: catalyst/base/ targets/support/ X-VCS-Committer: mattst88 X-VCS-Committer-Name: Matt Turner X-VCS-Revision: 718a67fc8927ae28574182a0fe551e99ee6d66ce X-VCS-Branch: pending/mattst88 Date: Wed, 20 May 2020 03:39:53 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 1f5ebeb6-dfea-4887-8311-ad1b20220541 X-Archives-Hash: c2cc2f2663dd3e3a1350df2ecb0a9562 commit: 718a67fc8927ae28574182a0fe551e99ee6d66ce Author: Matt Turner gentoo org> AuthorDate: Wed May 20 02:22:11 2020 +0000 Commit: Matt Turner gentoo 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 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 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 3D1BA1382C5 for ; Thu, 21 May 2020 20:25:43 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9A493E09CD; Thu, 21 May 2020 20:25:39 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 6D9B7E09CC for ; Thu, 21 May 2020 20:25:39 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5EFBD34F2B1 for ; Thu, 21 May 2020 20:25:38 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B2F4F267 for ; Thu, 21 May 2020 20:25:34 +0000 (UTC) From: "Matt Turner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Turner" Message-ID: <1589944393.718a67fc8927ae28574182a0fe551e99ee6d66ce.mattst88@gentoo> Subject: [gentoo-commits] proj/catalyst:master commit in: catalyst/base/, targets/support/ X-VCS-Repository: proj/catalyst X-VCS-Files: catalyst/base/stagebase.py targets/support/chroot-functions.sh targets/support/kmerge.sh X-VCS-Directories: catalyst/base/ targets/support/ X-VCS-Committer: mattst88 X-VCS-Committer-Name: Matt Turner X-VCS-Revision: 718a67fc8927ae28574182a0fe551e99ee6d66ce X-VCS-Branch: master Date: Thu, 21 May 2020 20:25:34 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 64bc0552-5e39-4569-be25-af1dcaf5b566 X-Archives-Hash: f745de3b3662081d8754d01ab07e536a Message-ID: <20200521202534.Qo2NfsNoIuqkjY1-1LT8EvOoVYjIxNP5svP5owpx0eU@z> commit: 718a67fc8927ae28574182a0fe551e99ee6d66ce Author: Matt Turner gentoo org> AuthorDate: Wed May 20 02:22:11 2020 +0000 Commit: Matt Turner gentoo 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 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 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 013B61382C5 for ; Wed, 20 May 2020 03:39:42 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A951EE0824; Wed, 20 May 2020 03:39:40 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 31D98E07A5 for ; Wed, 20 May 2020 03:39:39 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B6FBF34F1BB for ; Wed, 20 May 2020 03:39:38 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5CF1424E for ; Wed, 20 May 2020 03:39:36 +0000 (UTC) From: "Matt Turner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Turner" Message-ID: <1589944393.718a67fc8927ae28574182a0fe551e99ee6d66ce.mattst88@gentoo> Subject: [gentoo-commits] proj/catalyst:wip/mattst88 commit in: catalyst/base/, targets/support/ X-VCS-Repository: proj/catalyst X-VCS-Files: catalyst/base/stagebase.py targets/support/chroot-functions.sh targets/support/kmerge.sh X-VCS-Directories: catalyst/base/ targets/support/ X-VCS-Committer: mattst88 X-VCS-Committer-Name: Matt Turner X-VCS-Revision: 718a67fc8927ae28574182a0fe551e99ee6d66ce X-VCS-Branch: wip/mattst88 Date: Wed, 20 May 2020 03:39:36 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: d8114852-22e9-4a23-be06-3fd7972f8e7f X-Archives-Hash: 48b9abc85cde5c6c48e268197e7244bb Message-ID: <20200520033936.YmByMagiWrUoHiYQGXbN3t6s8IxGSLDBa9pdHULGIlA@z> commit: 718a67fc8927ae28574182a0fe551e99ee6d66ce Author: Matt Turner gentoo org> AuthorDate: Wed May 20 02:22:11 2020 +0000 Commit: Matt Turner gentoo 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 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