From a0148f998ad81700f68402ab3f58140e6d32f57d Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Tue, 7 Apr 2020 21:48:56 -0700 Subject: Revert "Support PORTAGE_LOG_FILTER_FILE (bug 709746)" This reverts commit 73f72f526a66b9953a46868cc1390fde2820997f. Bug: https://bugs.gentoo.org/716636 Signed-off-by: Zac Medico --- lib/_emerge/EbuildPhase.py | 36 +++++++----------------------------- 1 file changed, 7 insertions(+), 29 deletions(-) (limited to 'lib/_emerge/EbuildPhase.py') diff --git a/lib/_emerge/EbuildPhase.py b/lib/_emerge/EbuildPhase.py index 927a74b98..f6b380e05 100644 --- a/lib/_emerge/EbuildPhase.py +++ b/lib/_emerge/EbuildPhase.py @@ -26,8 +26,6 @@ from portage.package.ebuild.prepare_build_dirs import (_prepare_workdir, from portage.util.futures.compat_coroutine import coroutine, coroutine_return from portage.util import writemsg from portage.util._async.AsyncTaskFuture import AsyncTaskFuture -from portage.util._async.BuildLogger import BuildLogger -from portage.util.futures import asyncio from portage.util.futures.executor.fork import ForkExecutor try: @@ -132,7 +130,7 @@ class EbuildPhase(CompositeTask): # Force background=True for this header since it's intended # for the log and it doesn't necessarily need to be visible # elsewhere. - yield self._elog('einfo', msg, background=True) + self._elog('einfo', msg, background=True) if self.phase == 'package': if 'PORTAGE_BINPKG_TMPFILE' not in self.settings: @@ -394,7 +392,6 @@ class EbuildPhase(CompositeTask): self.returncode = 1 self.wait() - @coroutine def _elog(self, elog_funcname, lines, background=None): if background is None: background = self.background @@ -411,30 +408,11 @@ class EbuildPhase(CompositeTask): portage.output.havecolor = global_havecolor msg = out.getvalue() if msg: - build_logger = None - try: - log_file = None - log_path = None - if self.settings.get("PORTAGE_BACKGROUND") != "subprocess": - log_path = self.settings.get("PORTAGE_LOG_FILE") - if log_path: - build_logger = BuildLogger(env=self.settings.environ(), - log_path=log_path, - log_filter_file=self.settings.get('PORTAGE_LOG_FILTER_FILE'), - scheduler=self.scheduler) - yield build_logger.async_start() - log_file = build_logger.stdin - - yield self.scheduler.async_output(msg, log_file=log_file, - background=background) - - if build_logger is not None: - build_logger.stdin.close() - yield build_logger.async_wait() - except asyncio.CancelledError: - if build_logger is not None: - build_logger.cancel() - raise + log_path = None + if self.settings.get("PORTAGE_BACKGROUND") != "subprocess": + log_path = self.settings.get("PORTAGE_LOG_FILE") + self.scheduler.output(msg, log_path=log_path, + background=background) class _PostPhaseCommands(CompositeTask): @@ -503,4 +481,4 @@ class _PostPhaseCommands(CompositeTask): qa_msg.extend("\t%s: %s" % (filename, " ".join(sorted(soname_deps))) for filename, soname_deps in unresolved) qa_msg.append("") - yield self.elog("eqawarn", qa_msg) + self.elog("eqawarn", qa_msg) -- cgit v1.2.3-65-gdbad