From 73f26e98812ca018f12c4221d9d556c3d467d190 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Mon, 12 Jun 2006 23:22:05 +0000 Subject: [PATCH] Prevent extra newlines in elog for einfo invocations. See bug #136208. svn path=/main/trunk/; revision=3501 --- bin/isolated-functions.sh | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/bin/isolated-functions.sh b/bin/isolated-functions.sh index be054d4ee..0bb4fa6d5 100644 --- a/bin/isolated-functions.sh +++ b/bin/isolated-functions.sh @@ -49,7 +49,7 @@ esyslog() { } einfo() { - einfon "$*\n" + einfon "$*" LAST_E_CMD="einfo" return 0 } @@ -57,7 +57,11 @@ einfo() { einfon() { elog_base INFO "$*" [[ ${RC_ENDCOL} != "yes" && ${LAST_E_CMD} == "ebegin" ]] && echo - echo -ne " ${GOOD}*${NORMAL} $*" + if [ "${FUNCNAME[1]}" == "einfo" ]; then + echo -e " ${GOOD}*${NORMAL} $*" + else + echo -ne " ${GOOD}*${NORMAL} $*" + fi LAST_E_CMD="einfon" return 0 } -- 2.26.2