diff options
| author | Zac Medico <zmedico@gentoo.org> | 2011-11-18 10:20:21 -0800 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2011-11-18 10:20:21 -0800 |
| commit | 935694debc955a18a6a93af923f3f98caacf3f74 (patch) | |
| tree | 112323c2e48440188e0446ee61f70ad4cbacb7d0 | |
| parent | d47f28881fcdd57d239e9b6e57ccb2755855d4ca (diff) | |
| download | portage-935694debc955a18a6a93af923f3f98caacf3f74.tar.gz portage-935694debc955a18a6a93af923f3f98caacf3f74.tar.bz2 portage-935694debc955a18a6a93af923f3f98caacf3f74.zip | |
collect_ebuild_messages: handle \r, bug #390833
| -rw-r--r-- | pym/portage/elog/messages.py | 5 |
1 files changed, 3 insertions, 2 deletions
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: |