| 1 |
commit: 718a67fc8927ae28574182a0fe551e99ee6d66ce |
| 2 |
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed May 20 02:22:11 2020 +0000 |
| 4 |
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed May 20 03:13:13 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=718a67fc |
| 7 |
|
| 8 |
catalyst: Only emit true boolean envars |
| 9 |
|
| 10 |
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> |
| 11 |
|
| 12 |
catalyst/base/stagebase.py | 2 -- |
| 13 |
targets/support/chroot-functions.sh | 6 +++--- |
| 14 |
targets/support/kmerge.sh | 4 ++-- |
| 15 |
3 files changed, 5 insertions(+), 7 deletions(-) |
| 16 |
|
| 17 |
diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py |
| 18 |
index 8e2b08da..645a9f61 100644 |
| 19 |
--- a/catalyst/base/stagebase.py |
| 20 |
+++ b/catalyst/base/stagebase.py |
| 21 |
@@ -1283,8 +1283,6 @@ class StageBase(TargetBase, ClearBase, GenBase): |
| 22 |
elif isinstance(self.settings[x], bool): |
| 23 |
if self.settings[x]: |
| 24 |
self.env[varname] = "true" |
| 25 |
- else: |
| 26 |
- self.env[varname] = "false" |
| 27 |
elif isinstance(self.settings[x], dict): |
| 28 |
if x in ['compress_definitions', 'decompress_definitions']: |
| 29 |
continue |
| 30 |
|
| 31 |
diff --git a/targets/support/chroot-functions.sh b/targets/support/chroot-functions.sh |
| 32 |
index b6e221af..b531eb6a 100755 |
| 33 |
--- a/targets/support/chroot-functions.sh |
| 34 |
+++ b/targets/support/chroot-functions.sh |
| 35 |
@@ -117,7 +117,7 @@ setup_emerge_opts() { |
| 36 |
emerge_opts=() |
| 37 |
bootstrap_opts=() |
| 38 |
|
| 39 |
- if [[ "${clst_VERBOSE}" == "true" ]] |
| 40 |
+ if [ -n "${clst_VERBOSE}" ] |
| 41 |
then |
| 42 |
emerge_opts+=(--verbose) |
| 43 |
bootstrap_opts+=(-v) |
| 44 |
@@ -256,7 +256,7 @@ run_merge() { |
| 45 |
export EPAUSE_IGNORE=0 |
| 46 |
[[ $CONFIG_PROTECT != "-*"* ]] && export CONFIG_PROTECT="-*" |
| 47 |
|
| 48 |
- if [[ "${clst_VERBOSE}" == "true" ]] |
| 49 |
+ if [ -n "${clst_VERBOSE}" ] |
| 50 |
then |
| 51 |
echo "ROOT=${ROOT} emerge ${emerge_opts[@]} -pt $@" || exit 1 |
| 52 |
emerge ${emerge_opts[@]} -pt $@ || exit 3 |
| 53 |
@@ -268,7 +268,7 @@ run_merge() { |
| 54 |
} |
| 55 |
|
| 56 |
show_debug() { |
| 57 |
- if [ "${clst_DEBUG}" = "1" ] |
| 58 |
+ if [ -n "${clst_DEBUG}" ] |
| 59 |
then |
| 60 |
unset PACKAGES |
| 61 |
echo "DEBUG:" |
| 62 |
|
| 63 |
diff --git a/targets/support/kmerge.sh b/targets/support/kmerge.sh |
| 64 |
index 6b589493..702c5454 100755 |
| 65 |
--- a/targets/support/kmerge.sh |
| 66 |
+++ b/targets/support/kmerge.sh |
| 67 |
@@ -58,7 +58,7 @@ setup_gk_args() { |
| 68 |
fi |
| 69 |
fi |
| 70 |
|
| 71 |
- if [[ "${clst_VERBOSE}" == "true" ]] |
| 72 |
+ if [ -n "${clst_VERBOSE}" ] |
| 73 |
then |
| 74 |
GK_ARGS+=(--loglevel=2) |
| 75 |
fi |
| 76 |
@@ -85,7 +85,7 @@ genkernel_compile(){ |
| 77 |
esac |
| 78 |
# Build with genkernel using the set options |
| 79 |
# callback is put here to avoid escaping issues |
| 80 |
- if [[ "${clst_VERBOSE}" == "true" ]] |
| 81 |
+ if [ -n "${clst_VERBOSE}" ] |
| 82 |
then |
| 83 |
gk_callback_opts=(-vN) |
| 84 |
else |
Archives