From f3cdcad7d235e8f1cabe7664a0fc4800a01f129f Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Tue, 13 Jul 2010 18:03:14 -0700 Subject: [PATCH] Use _encodings['merge'] for *.la filenames. --- pym/portage/package/ebuild/doebuild.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pym/portage/package/ebuild/doebuild.py b/pym/portage/package/ebuild/doebuild.py index 1198e53ea..e9a293628 100644 --- a/pym/portage/package/ebuild/doebuild.py +++ b/pym/portage/package/ebuild/doebuild.py @@ -1622,7 +1622,7 @@ def _post_src_install_uid_fix(mysettings, out): if lafilefixing and \ fname.endswith(".la") and os.path.isfile(fpath): f = open(_unicode_encode(fpath, - encoding=_encodings['fs'], errors='strict'), + encoding=_encodings['merge'], errors='strict'), mode='rb') contents = f.read() f.close() @@ -1643,7 +1643,7 @@ def _post_src_install_uid_fix(mysettings, out): writemsg("Fixing .la files\n", fd=out) writemsg(" %s\n" % fpath[len(destdir):], fd=out) f = open(_unicode_encode(fpath, - encoding=_encodings['fs'], errors='strict'), + encoding=_encodings['merge'], errors='strict'), mode='wb') f.write(new_contents) f.close() -- 2.26.2