summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2006-06-12 23:22:05 +0000
committerZac Medico <zmedico@gentoo.org>2006-06-12 23:22:05 +0000
commit73f26e98812ca018f12c4221d9d556c3d467d190 (patch)
tree9c94b30a414697834ef0b6c39041dd24514efa48
parente9aa0ce7dd17b058b2ba0268c70902590314dbfd (diff)
downloadportage-73f26e98812ca018f12c4221d9d556c3d467d190.tar.gz
portage-73f26e98812ca018f12c4221d9d556c3d467d190.tar.bz2
portage-73f26e98812ca018f12c4221d9d556c3d467d190.zip
Prevent extra newlines in elog for einfo invocations. See bug #136208.
svn path=/main/trunk/; revision=3501
-rw-r--r--bin/isolated-functions.sh8
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
}