From 463387f0504fd0477bfe7ac9d2687b0a95320e3d Mon Sep 17 00:00:00 2001
From: Zac Medico <zmedico@gentoo.org>
Date: Wed, 21 Jun 2006 01:57:37 +0000
Subject: [PATCH] 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
---
 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