diff --git a/reboot-in-phase.patch b/reboot-in-phase.patch index d607cf0..95da958 100644 --- a/reboot-in-phase.patch +++ b/reboot-in-phase.patch @@ -35,15 +35,6 @@ index 516f292..0ad9913 100644 # display a warning message if run in POSIX mode if [ $POSIXFIXED == "YES" ] ; then -@@ -608,7 +625,7 @@ rljClosePhase(){ - __INTERNAL_LogText '' - local logfile="$(mktemp)" - tail -n +$((__INTERNAL_PHASE_TXTLOG_START+1)) $__INTERNAL_BEAKERLIB_JOURNAL_TXT > $logfile -- rlReport "$(echo "$name" | sed 's/[^[:alnum:]]\+/-/g')" "$result" "$score" "$logfile" -+ rlReport "$(echo "${name//[^[:alnum:]]/-}" | tr -s '-')" "$result" "$score" "$logfile" - rm -f $logfile - - # Reset of state variables @@ -938,20 +957,30 @@ __INTERNAL_PrintHeadLog() { # should be called before and after that respectively. @@ -89,21 +80,3 @@ index 516f292..0ad9913 100644 } __INTERNAL_PersistentDataLoad() { -diff --git a/src/logging.sh b/src/logging.sh -index 95604c1..083d6d0 100644 ---- a/src/logging.sh -+++ b/src/logging.sh -@@ -237,7 +238,12 @@ DEBUG=${DEBUG:-""} - - rlLogDebug() { - if [ "$DEBUG" == 'true' -o "$DEBUG" == '1' -o "$LOG_LEVEL" == "DEBUG" ]; then -- rlLog "$1" "$2" "DEBUG" && rljAddMessage "$1" "DEBUG" -+ if [[ -n "$DEBUG_TO_CONSOLE_ONLY" ]]; then -+ local __INTERNAL_LogText_no_file=1 -+ __INTERNAL_LogText "$1" "DEBUG" -+ else -+ rlLog "$1" "$2" "DEBUG" -+ fi - fi - } - rlLogInfo() { rlLog "$1" "$2" "INFO"; }