summaryrefslogtreecommitdiffstats
path: root/pym/_emerge/changelog.py
diff options
context:
space:
mode:
Diffstat (limited to 'pym/_emerge/changelog.py')
-rw-r--r--pym/_emerge/changelog.py8
1 files changed, 6 insertions, 2 deletions
diff --git a/pym/_emerge/changelog.py b/pym/_emerge/changelog.py
index 4adb8b25b..0fdf5880a 100644
--- a/pym/_emerge/changelog.py
+++ b/pym/_emerge/changelog.py
@@ -7,6 +7,8 @@ import re
import portage
from portage import os
+from portage import _encodings
+from portage import _unicode_encode
def calc_changelog(ebuildpath,current,next):
if ebuildpath == None or not os.path.exists(ebuildpath):
@@ -19,8 +21,10 @@ def calc_changelog(ebuildpath,current,next):
next = next[:-3]
changelogpath = os.path.join(os.path.split(ebuildpath)[0],'ChangeLog')
try:
- changelog = codecs.open(portage._unicode_encode(changelogpath),
- mode='r', encoding='utf_8', errors='replace').read()
+ changelog = codecs.open(_unicode_encode(changelogpath,
+ encoding=_encodings['fs'], errors='strict'),
+ mode='r', encoding=_encodings['repo.content'], errors='replace'
+ ).read()
except SystemExit, e:
raise # Needed else can't exit
except: