commit: ea1c12ac91faeb25b30d364afa1764506b7a1535 Author: Zac Medico <zmedico <AT> gentoo <DOT> org> AuthorDate: Mon Oct 16 04:48:10 2023 +0000 Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> CommitDate: Mon Oct 16 05:14:08 2023 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=ea1c12ac
_post_src_install_uid_fix: Pass unicode to write_atomic for utf8_mode Bug: https://bugs.gentoo.org/915837 Signed-off-by: Zac Medico <zmedico <AT> gentoo.org> lib/portage/package/ebuild/doebuild.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/portage/package/ebuild/doebuild.py b/lib/portage/package/ebuild/doebuild.py index 5780c2b0b3..b967fc061f 100644 --- a/lib/portage/package/ebuild/doebuild.py +++ b/lib/portage/package/ebuild/doebuild.py @@ -2777,7 +2777,9 @@ def _post_src_install_uid_fix(mysettings, out): # a normal write might fail due to file permission # settings on some operating systems such as HP-UX write_atomic( - _unicode_encode( + fpath + if portage.utf8_mode + else _unicode_encode( fpath, encoding=_encodings["merge"], errors="strict" ), new_contents,
