diff options
| author | Zac Medico <zmedico@gentoo.org> | 2008-07-27 13:59:29 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2008-07-27 13:59:29 +0000 |
| commit | d63d37d512ecba2a61475ea4a6c4e4807524ef7f (patch) | |
| tree | fb4064ce7c32e48e3cfe58d02c63e2fb0cc045bb | |
| parent | c5181015ce248383917492246d971d7a389f0772 (diff) | |
| download | portage-d63d37d512ecba2a61475ea4a6c4e4807524ef7f.tar.gz portage-d63d37d512ecba2a61475ea4a6c4e4807524ef7f.tar.bz2 portage-d63d37d512ecba2a61475ea4a6c4e4807524ef7f.zip | |
Make all the elog functions split lines when displaying output, just like
elog_base() does when saving it.
svn path=/main/trunk/; revision=11219
| -rwxr-xr-x | bin/isolated-functions.sh | 40 |
1 files changed, 35 insertions, 5 deletions
diff --git a/bin/isolated-functions.sh b/bin/isolated-functions.sh index 4de6f8503..e0d8fb08a 100755 --- a/bin/isolated-functions.sh +++ b/bin/isolated-functions.sh @@ -183,7 +183,13 @@ elog_base() { eqawarn() { elog_base QA "$*" [[ ${RC_ENDCOL} != "yes" && ${LAST_E_CMD} == "ebegin" ]] && echo - vecho -e " ${WARN}*${NORMAL} $*" >&2 + save_IFS + IFS=$'\n' + local line + for line in $* ; do + vecho -e " ${WARN}*${NORMAL} ${line}" >&2 + done + restore_IFS LAST_E_CMD="eqawarn" return 0 } @@ -191,7 +197,13 @@ eqawarn() { elog() { elog_base LOG "$*" [[ ${RC_ENDCOL} != "yes" && ${LAST_E_CMD} == "ebegin" ]] && echo - echo -e " ${GOOD}*${NORMAL} $*" + save_IFS + IFS=$'\n' + local line + for line in $* ; do + echo -e " ${GOOD}*${NORMAL} ${line}" + done + restore_IFS LAST_E_CMD="elog" return 0 } @@ -217,7 +229,13 @@ esyslog() { einfo() { elog_base INFO "$*" [[ ${RC_ENDCOL} != "yes" && ${LAST_E_CMD} == "ebegin" ]] && echo - echo -e " ${GOOD}*${NORMAL} $*" + save_IFS + IFS=$'\n' + local line + for line in $* ; do + echo -e " ${GOOD}*${NORMAL} ${line}" + done + restore_IFS LAST_E_CMD="einfo" return 0 } @@ -233,7 +251,13 @@ einfon() { ewarn() { elog_base WARN "$*" [[ ${RC_ENDCOL} != "yes" && ${LAST_E_CMD} == "ebegin" ]] && echo - echo -e " ${WARN}*${NORMAL} ${RC_INDENTATION}$*" >&2 + save_IFS + IFS=$'\n' + local line + for line in $* ; do + echo -e " ${WARN}*${NORMAL} ${RC_INDENTATION}${line}" >&2 + done + restore_IFS LAST_E_CMD="ewarn" return 0 } @@ -241,7 +265,13 @@ ewarn() { eerror() { elog_base ERROR "$*" [[ ${RC_ENDCOL} != "yes" && ${LAST_E_CMD} == "ebegin" ]] && echo - echo -e " ${BAD}*${NORMAL} ${RC_INDENTATION}$*" >&2 + save_IFS + IFS=$'\n' + local line + for line in $* ; do + echo -e " ${BAD}*${NORMAL} ${RC_INDENTATION}${line}" >&2 + done + restore_IFS LAST_E_CMD="eerror" return 0 } |