diff options
| author | Zac Medico <zmedico@gentoo.org> | 2006-06-21 01:57:37 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2006-06-21 01:57:37 +0000 |
| commit | 463387f0504fd0477bfe7ac9d2687b0a95320e3d (patch) | |
| tree | ff98813c8e3e4158a7c15ca04cae8cc906d91f56 /bin/isolated-functions.sh | |
| parent | e8a5e7f403c310625b72d2301ccdf5051330fb9b (diff) | |
| download | portage-463387f0504fd0477bfe7ac9d2687b0a95320e3d.tar.gz portage-463387f0504fd0477bfe7ac9d2687b0a95320e3d.tar.bz2 portage-463387f0504fd0477bfe7ac9d2687b0a95320e3d.zip | |
Prevent extra newlines in elog for einfo invocations. See bug #136208. This patch is from trunk r3501.
svn path=/main/branches/2.1/; revision=3557
Diffstat (limited to 'bin/isolated-functions.sh')
| -rw-r--r-- | bin/isolated-functions.sh | 8 |
1 files 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 } |