diff options
| author |   Alexey Neyman <stilor@att.net> | 2019-02-18 18:22:17 (GMT) |
|---|---|---|
| committer |   GitHub <noreply@github.com> | 2019-02-18 18:22:17 (GMT) |
| commit | 7d621cd831e4fb015fa151437051192135337006 (patch) | |
| tree | 7f1313ccc9112cb0bc1a231a33c5344e54ec2c94 /scripts/functions | |
| parent | fb744d81588395a97cee951a151a56501a500e42 (diff) | |
| parent | 8a61f74f38e33166f6be0dde0cae82cfe055c3bf (diff) | |
Merge pull request #1142 from stilor/rc2-fixes
Fixes for regressions in 1.24.0-rc1
Diffstat (limited to 'scripts/functions')
| -rw-r--r-- | scripts/functions | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/scripts/functions b/scripts/functions index f71ea04..e577b9d 100644 --- a/scripts/functions +++ b/scripts/functions @@ -283,13 +283,15 @@ CT_DoLog() { _prog_bar[3]='|' indent=$((2*CT_STEP_COUNT)) while read line; do - case "${CT_LOG_SEE_TOOLS_WARN},${line}" in - y,*"warning:"*) cur_L=WARN; cur_l=${CT_LOG_LEVEL_WARN};; - y,*"WARNING:"*) cur_L=WARN; cur_l=${CT_LOG_LEVEL_WARN};; - *"error:"*) cur_L=ERROR; cur_l=${CT_LOG_LEVEL_ERROR};; - *"Error:"*) cur_L=ERROR; cur_l=${CT_LOG_LEVEL_ERROR};; - *"make["*"]: ***"*) cur_L=ERROR; cur_l=${CT_LOG_LEVEL_ERROR};; - *) cur_L="${LEVEL}"; cur_l="${level}";; + case "${CT_LOG_SEE_TOOLS_WARN:-n},${line}" in + y,*[[:space:]][Ww]arning:*|y,[Ww]arning:*|y,*[[:space:]]WARNING:*|y,WARNING:*) + cur_L=WARN; cur_l=${CT_LOG_LEVEL_WARN};; + *[[:space:]][Ee]rror:*|[yn],[Ee]rror:*) + cur_L=ERROR; cur_l=${CT_LOG_LEVEL_ERROR};; + *"make["*"]: ***"*) + cur_L=ERROR; cur_l=${CT_LOG_LEVEL_ERROR};; + *) + cur_L="${LEVEL}"; cur_l="${level}";; esac # There will always be a log file (stdout, fd #1), be it /dev/null if [ -n "${CT_LOG_ENABLED}" ]; then |