From: Marius Mauch <genone@gentoo.org>
Date: Tue, 17 Jun 2008 17:35:18 +0000 (-0000)
Subject: Remove eblank nonsense
X-Git-Tag: v2.2_rc1~19
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=9be15f3d3f58f4afb83f45060cf29dbd65761f16;p=portage.git

Remove eblank nonsense

svn path=/main/trunk/; revision=10694
---

diff --git a/bin/isolated-functions.sh b/bin/isolated-functions.sh
index 5851a55c7..1eacf4414 100755
--- a/bin/isolated-functions.sh
+++ b/bin/isolated-functions.sh
@@ -161,7 +161,7 @@ elog_base() {
 	local messagetype
 	[ -z "${1}" -o -z "${T}" -o ! -d "${T}/logging" ] && return 1
 	case "${1}" in
-		BLANK|INFO|WARN|ERROR|LOG|QA)
+		INFO|WARN|ERROR|LOG|QA)
 			messagetype="${1}"
 			shift
 			;;
@@ -174,15 +174,6 @@ elog_base() {
 	return 0
 }
 
-eblank() {
-	[[ ${LAST_E_CMD} == "eblank" ]] && return 0
-	elog_base BLANK
-	[[ ${RC_ENDCOL} != "yes" && ${LAST_E_CMD} == "ebegin" ]] && echo
-	echo -e " ${BLANK}*${NORMAL}"
-	LAST_E_CMD="eblank"
-	return 0
-}
-
 eqawarn() {
 	elog_base QA "$*"
 	[[ ${RC_ENDCOL} != "yes" && ${LAST_E_CMD} == "ebegin" ]] && echo
diff --git a/pym/portage/elog/messages.py b/pym/portage/elog/messages.py
index 341a61d1f..d33542ef1 100644
--- a/pym/portage/elog/messages.py
+++ b/pym/portage/elog/messages.py
@@ -43,8 +43,10 @@ def collect_ebuild_messages(path):
 				writemsg("!!! malformed entry in " + \
 					"log file: '%s'\n" % filename, noiselevel=-1)
 				continue
+
 			if lastmsgtype is None:
 				lastmsgtype = msgtype
+			
 			if msgtype == lastmsgtype:
 				msgcontent.append(msg)
 			else:
diff --git a/pym/portage/elog/mod_echo.py b/pym/portage/elog/mod_echo.py
index 1c83600a4..30d88f005 100644
--- a/pym/portage/elog/mod_echo.py
+++ b/pym/portage/elog/mod_echo.py
@@ -33,8 +33,7 @@ def finalize(mysettings=None):
 						"WARN": printer.ewarn,
 						"ERROR": printer.eerror,
 						"LOG": printer.einfo,
-						"QA": printer.ewarn,
-						"BLANK": printer.eblank}
+						"QA": printer.ewarn}
 				if isinstance(msgcontent, basestring):
 					msgcontent = [msgcontent]
 				for line in msgcontent:
diff --git a/pym/portage/output.py b/pym/portage/output.py
index 4d0ab42ec..482747e35 100644
--- a/pym/portage/output.py
+++ b/pym/portage/output.py
@@ -544,20 +544,6 @@ class EOutput(object):
 			sys.stdout.flush()
 		self.__last_e_cmd = "ewarn"
 
-	def eblank(self, msg):
-		"""
-		Shows a blank line. Consecutive eblank calls are all collapsed
-		into a single blank line.
-		"""
-		if self.__last_e_cmd == "eblank":
-			return
-		if not self.quiet:
-			if self.__last_e_cmd == "ebegin":
-				sys.stdout.write("\n")
-			sys.stdout.write(colorize("BLANK", " * ") + "\n")
-			sys.stdout.flush()
-		self.__last_e_cmd = "eblank"
-
 	def ewend(self, errno, *msg):
 		"""
 		Indicates the completion of a process, optionally displaying a message