From: Zac Medico <zmedico@gentoo.org>
Date: Fri, 18 Nov 2011 18:20:21 +0000 (-0800)
Subject: collect_ebuild_messages: handle \r, bug #390833
X-Git-Tag: v2.2.0_alpha76~2
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=935694debc955a18a6a93af923f3f98caacf3f74;p=portage.git

collect_ebuild_messages: handle \r, bug #390833
---

diff --git a/pym/portage/elog/messages.py b/pym/portage/elog/messages.py
index ba2ed466b..a4897d8d8 100644
--- a/pym/portage/elog/messages.py
+++ b/pym/portage/elog/messages.py
@@ -54,8 +54,9 @@ def collect_ebuild_messages(path):
 		f = io.open(_unicode_encode(filename,
 			encoding=_encodings['fs'], errors='strict'),
 			mode='r', encoding=_encodings['repo.content'], errors='replace')
-		for l in f:
-			l = l.rstrip('\n')
+		# Use split('\n') since normal line iteration or readlines() will
+		# split on \r characters as shown in bug #390833.
+		for l in f.read().split('\n'):
 			if not l:
 				continue
 			try: