From: Zac Medico <zmedico@gentoo.org>
Date: Wed, 21 Jun 2006 01:57:37 +0000 (-0000)
Subject: Prevent extra newlines in elog for einfo invocations. See bug #136208.  This patch... 
X-Git-Tag: v2.1-r1~22
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=463387f0504fd0477bfe7ac9d2687b0a95320e3d;p=portage.git

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
---

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
 }