diff options
| author | Zac Medico <zmedico@gentoo.org> | 2010-07-13 18:03:14 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2010-07-13 18:03:14 -0700 |
| commit | f3cdcad7d235e8f1cabe7664a0fc4800a01f129f (patch) | |
| tree | 620e1d537d37072146204b1dd0eff2cb8db6075a | |
| parent | c6ad8e0bc8c347383fdce8f5d120f613bfbe07d2 (diff) | |
| download | portage-f3cdcad7d235e8f1cabe7664a0fc4800a01f129f.tar.gz portage-f3cdcad7d235e8f1cabe7664a0fc4800a01f129f.tar.bz2 portage-f3cdcad7d235e8f1cabe7664a0fc4800a01f129f.zip | |
Use _encodings['merge'] for *.la filenames.
| -rw-r--r-- | pym/portage/package/ebuild/doebuild.py | 4 |
1 files 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() |