From: Zac Medico <zmedico@gentoo.org>
Date: Fri, 19 Oct 2007 19:18:24 +0000 (-0000)
Subject: Prevent _combine_logentries() from generating redundant
X-Git-Tag: v2.2_pre1~589
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=60d2fa528eac86e73b5f30421c145cbaa3b5eb33;p=portage.git

Prevent _combine_logentries() from generating redundant
consecutive 'TYPE: phase' lines that show in summary.log
when the python-based elog functions are used.

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

diff --git a/pym/portage/elog/__init__.py b/pym/portage/elog/__init__.py
index 9e309f75f..4049b5521 100644
--- a/pym/portage/elog/__init__.py
+++ b/pym/portage/elog/__init__.py
@@ -33,8 +33,11 @@ def _combine_logentries(logentries):
 	for phase in EBUILD_PHASES:
 		if not phase in logentries:
 			continue
+		previous_type = None
 		for msgtype, msgcontent in logentries[phase]:
-			rValue += "%s: %s\n" % (msgtype, phase)
+			if previous_type != msgtype:
+				previous_type = msgtype
+				rValue += "%s: %s\n" % (msgtype, phase)
 			for line in msgcontent:
 				rValue += line
 			rValue += "\n"