aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2020-04-07 21:34:56 -0700
committerZac Medico <zmedico@gentoo.org>2020-04-07 22:29:45 -0700
commit17df30bdfb72a157f9e34f3c2efa1e59389861d4 (patch)
treeed6cb0016c78b0a7b4dc577ab18be119f5c4efbd /lib/_emerge
parentprocess: Unshare UTS namespace, and set hostname to 'localhost' (diff)
downloadportage-17df30bdfb72a157f9e34f3c2efa1e59389861d4.tar.gz
portage-17df30bdfb72a157f9e34f3c2efa1e59389861d4.tar.bz2
portage-17df30bdfb72a157f9e34f3c2efa1e59389861d4.zip
Revert "Rename PORTAGE_LOG_FILTER_FILE_CMD from PORTAGE_LOG_FILTER_FILE"
This reverts commit e24859eaa03ec86e10d842296f5570dd98bed4b7. Bug: https://bugs.gentoo.org/716636 Signed-off-by: Zac Medico <zmedico@gentoo.org>
Diffstat (limited to 'lib/_emerge')
-rw-r--r--lib/_emerge/AbstractEbuildProcess.py2
-rw-r--r--lib/_emerge/EbuildPhase.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/_emerge/AbstractEbuildProcess.py b/lib/_emerge/AbstractEbuildProcess.py
index cc1ea0f1a..6b2c2f81b 100644
--- a/lib/_emerge/AbstractEbuildProcess.py
+++ b/lib/_emerge/AbstractEbuildProcess.py
@@ -181,7 +181,7 @@ class AbstractEbuildProcess(SpawnProcess):
null_fd = os.open('/dev/null', os.O_RDONLY)
self.fd_pipes[0] = null_fd
- self.log_filter_file = self.settings.get('PORTAGE_LOG_FILTER_FILE_CMD')
+ self.log_filter_file = self.settings.get('PORTAGE_LOG_FILTER_FILE')
try:
yield SpawnProcess._async_start(self)
diff --git a/lib/_emerge/EbuildPhase.py b/lib/_emerge/EbuildPhase.py
index fbb040ffd..927a74b98 100644
--- a/lib/_emerge/EbuildPhase.py
+++ b/lib/_emerge/EbuildPhase.py
@@ -420,7 +420,7 @@ class EbuildPhase(CompositeTask):
if log_path:
build_logger = BuildLogger(env=self.settings.environ(),
log_path=log_path,
- log_filter_file=self.settings.get('PORTAGE_LOG_FILTER_FILE_CMD'),
+ log_filter_file=self.settings.get('PORTAGE_LOG_FILTER_FILE'),
scheduler=self.scheduler)
yield build_logger.async_start()
log_file = build_logger.stdin