diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/_emerge/AbstractEbuildProcess.py | 2 | ||||
| -rw-r--r-- | lib/_emerge/EbuildPhase.py | 2 | ||||
| -rw-r--r-- | lib/portage/package/ebuild/_config/special_env_vars.py | 4 | ||||
| -rw-r--r-- | lib/portage/util/_async/BuildLogger.py | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/lib/_emerge/AbstractEbuildProcess.py b/lib/_emerge/AbstractEbuildProcess.py index 3732f80ed..45545ae15 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') + self.log_filter_file = self.settings.get('PORTAGE_LOG_FILTER_FILE_CMD') try: yield SpawnProcess._async_start(self) diff --git a/lib/_emerge/EbuildPhase.py b/lib/_emerge/EbuildPhase.py index 927a74b98..fbb040ffd 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'), + log_filter_file=self.settings.get('PORTAGE_LOG_FILTER_FILE_CMD'), scheduler=self.scheduler) yield build_logger.async_start() log_file = build_logger.stdin diff --git a/lib/portage/package/ebuild/_config/special_env_vars.py b/lib/portage/package/ebuild/_config/special_env_vars.py index dd8105123..c6f88f08c 100644 --- a/lib/portage/package/ebuild/_config/special_env_vars.py +++ b/lib/portage/package/ebuild/_config/special_env_vars.py @@ -175,7 +175,7 @@ environ_filter += [ "PORTAGE_RO_DISTDIRS", "PORTAGE_RSYNC_EXTRA_OPTS", "PORTAGE_RSYNC_OPTS", "PORTAGE_RSYNC_RETRIES", "PORTAGE_SSH_OPTS", "PORTAGE_SYNC_STALE", - "PORTAGE_USE", "PORTAGE_LOG_FILTER_FILE", + "PORTAGE_USE", "PORTAGE_LOG_FILTER_FILE_CMD", "PORTAGE_LOGDIR", "PORTAGE_LOGDIR_CLEAN", "QUICKPKG_DEFAULT_OPTS", "REPOMAN_DEFAULT_OPTS", "RESUMECOMMAND", "RESUMECOMMAND_FTP", @@ -205,7 +205,7 @@ default_globals = { } validate_commands = ('PORTAGE_BZIP2_COMMAND', 'PORTAGE_BUNZIP2_COMMAND', - 'PORTAGE_LOG_FILTER_FILE', + 'PORTAGE_LOG_FILTER_FILE_CMD', ) # To enhance usability, make some vars case insensitive diff --git a/lib/portage/util/_async/BuildLogger.py b/lib/portage/util/_async/BuildLogger.py index 4873d9750..49f1321fb 100644 --- a/lib/portage/util/_async/BuildLogger.py +++ b/lib/portage/util/_async/BuildLogger.py @@ -14,7 +14,7 @@ class BuildLogger(AsynchronousTask): Write to a log file, with compression support provided by PipeLogger. If the log_filter_file parameter is specified, then it is interpreted as a command to execute which filters log output (see the - PORTAGE_LOG_FILTER_FILE variable in make.conf(5)). The stdin property + PORTAGE_LOG_FILTER_FILE_CMD variable in make.conf(5)). The stdin property provides access to a writable binary file stream (refers to a pipe) that log content should be written to (usually redirected from subprocess stdout and stderr streams). |