From a7da3bd50c8863d7b6b6d101df763ae64de35097 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Sun, 14 Mar 2010 23:44:14 +0000 Subject: [PATCH] Bug #299095 - Always use UTF-8 codec when opening ebuilds, to avoid UnicodeDecodeError with python3. svn path=/main/trunk/; revision=15828 --- bin/repoman | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/bin/repoman b/bin/repoman index a6ae9a08f..26ca6e36f 100755 --- a/bin/repoman +++ b/bin/repoman @@ -2314,7 +2314,9 @@ else: from portage.util import write_atomic cvs_header = re.compile(r'^#\s*\$Header.*\$$') for x in myheaders: - f = open(x) + f = codecs.open(_unicode_encode(x, + encoding=_encodings['fs'], errors='strict'), + mode='r', encoding=_encodings['repo.content'], errors='strict') mylines = f.readlines() f.close() modified = False @@ -2323,7 +2325,8 @@ else: mylines[i] = line.replace("/Attic/", "/") modified = True if modified: - write_atomic(x, "".join(mylines)) + write_atomic(x, "".join(mylines), + encoding=_encodings['repo.content'], errors='strict') manifest_commit_required = True if vcs in ('cvs', 'svn') and (myupdates or myremoved): -- 2.26.2