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