36 lines
1.1 KiB
Diff
36 lines
1.1 KiB
Diff
From 7381fd558e64559029980def31faf6661909eeb8 Mon Sep 17 00:00:00 2001
|
|
From: Dalibor Pospisil <dapospis@redhat.com>
|
|
Date: Tue, 12 Dec 2017 16:04:01 +0100
|
|
Subject: [PATCH 16/18] nested phases enabled by default
|
|
|
|
this prevents some yet undocumented and officily unsupported behavoiur regression
|
|
---
|
|
src/journal.sh | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/src/journal.sh b/src/journal.sh
|
|
index 374ddfc..516f292 100644
|
|
--- a/src/journal.sh
|
|
+++ b/src/journal.sh
|
|
@@ -539,7 +539,7 @@ rljAddPhase(){
|
|
# Printing
|
|
__INTERNAL_PrintHeadLog "$MSG"
|
|
|
|
- if [[ -z "$BEAKERLIB_NESTED_PHASES" ]]; then
|
|
+ if [[ "$BEAKERLIB_NESTED_PHASES" == "0" ]]; then
|
|
__INTERNAL_METAFILE_INDENT_LEVEL=2
|
|
__INTERNAL_PHASE_TYPE=( "$1" )
|
|
__INTERNAL_PHASE_NAME=( "$MSG" )
|
|
@@ -612,7 +612,7 @@ rljClosePhase(){
|
|
rm -f $logfile
|
|
|
|
# Reset of state variables
|
|
- if [[ -z "$BEAKERLIB_NESTED_PHASES" ]]; then
|
|
+ if [[ "$BEAKERLIB_NESTED_PHASES" == "0" ]]; then
|
|
__INTERNAL_METAFILE_INDENT_LEVEL=1
|
|
__INTERNAL_PHASE_TYPE=()
|
|
__INTERNAL_PHASE_NAME=()
|
|
--
|
|
2.14.3
|
|
|