From 6bfc268ad1b2613eea6e85e386128a7c280a3197 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Fri, 14 Aug 2009 10:59:30 +0000 Subject: Rename and log installed files that don't conform to portage._merge_encoding (equal to sys.getfilesystemencoding()). svn path=/main/trunk/; revision=14029 --- pym/_emerge/EbuildPhase.py | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'pym/_emerge/EbuildPhase.py') diff --git a/pym/_emerge/EbuildPhase.py b/pym/_emerge/EbuildPhase.py index 598dcf7e3..9d2ec632d 100644 --- a/pym/_emerge/EbuildPhase.py +++ b/pym/_emerge/EbuildPhase.py @@ -48,8 +48,17 @@ class EbuildPhase(CompositeTask): settings = self.settings if self.phase == "install": + out = None + log_path = self.settings.get("PORTAGE_LOG_FILE") + log_file = None + if self.background and log_path is not None: + log_file = codecs.open(log_path, mode='a', + encoding='utf_8', errors='replace') + out = log_file portage._post_src_install_chost_fix(settings) - portage._post_src_install_uid_fix(settings) + portage._post_src_install_uid_fix(settings, out=out) + if log_file is not None: + log_file.close() post_phase_cmds = self._post_phase_cmds.get(self.phase) if post_phase_cmds is not None: -- cgit v1.2.3-1-g7c22