diff options
| author | Zac Medico <zmedico@gentoo.org> | 2009-08-14 10:59:30 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2009-08-14 10:59:30 +0000 |
| commit | 6bfc268ad1b2613eea6e85e386128a7c280a3197 (patch) | |
| tree | 4bc14645cf59744b43d1ec70224225462daaafd0 /pym/_emerge | |
| parent | ca449003c3f75997ebbc38784056898fdfad5013 (diff) | |
| download | portage-6bfc268ad1b2613eea6e85e386128a7c280a3197.tar.gz portage-6bfc268ad1b2613eea6e85e386128a7c280a3197.tar.bz2 portage-6bfc268ad1b2613eea6e85e386128a7c280a3197.zip | |
Rename and log installed files that don't conform to portage._merge_encoding
(equal to sys.getfilesystemencoding()).
svn path=/main/trunk/; revision=14029
Diffstat (limited to 'pym/_emerge')
| -rw-r--r-- | pym/_emerge/EbuildPhase.py | 11 |
1 files changed, 10 insertions, 1 deletions
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: |