From 935694debc955a18a6a93af923f3f98caacf3f74 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Fri, 18 Nov 2011 10:20:21 -0800 Subject: collect_ebuild_messages: handle \r, bug #390833 --- pym/portage/elog/messages.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'pym/portage/elog') 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: -- cgit v1.2.3-1-g7c22