From: Zac Medico <zmedico@gentoo.org>
Date: Mon, 10 Oct 2011 14:21:54 +0000 (-0700)
Subject: elog_process: add newlines for bug #386627
X-Git-Tag: v2.2.0_alpha66~6
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=8a119ea94ecc6668797e3a1358465ef3733f3a3e;p=portage.git

elog_process: add newlines for bug #386627

This fixes omission of newlines in saved messages since commit
ca7bef7821876791a26a5f9df6938f4c77fe571f.
---

diff --git a/pym/portage/elog/__init__.py b/pym/portage/elog/__init__.py
index 1a8309dbc..eeb6e7184 100644
--- a/pym/portage/elog/__init__.py
+++ b/pym/portage/elog/__init__.py
@@ -52,11 +52,11 @@ def _combine_logentries(logentries):
 		for msgtype, msgcontent in logentries[phase]:
 			if previous_type != msgtype:
 				previous_type = msgtype
-				rValue.append("%s: %s\n" % (msgtype, phase))
+				rValue.append("%s: %s" % (msgtype, phase))
 			for line in msgcontent:
-				rValue.append(line)
-			rValue.append("\n")
-	return "".join(rValue)
+				rValue.append(line.rstrip("\n"))
+			rValue.append("")
+	return "\n".join(rValue)
 
 _elog_mod_imports = {}
 def _load_mod(name):