commit: e24859eaa03ec86e10d842296f5570dd98bed4b7 Author: Zac Medico <zmedico <AT> gentoo <DOT> org> AuthorDate: Tue Mar 3 06:52:18 2020 +0000 Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> CommitDate: Tue Mar 3 06:52:46 2020 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=e24859ea
Rename PORTAGE_LOG_FILTER_FILE_CMD from PORTAGE_LOG_FILTER_FILE Suggested-by: Michael 'veremitz' Everitt <gentoo <AT> veremit.xyz> Bug: https://bugs.gentoo.org/709746 Signed-off-by: Zac Medico <zmedico <AT> gentoo.org> NEWS | 2 +- RELEASE-NOTES | 2 +- lib/_emerge/AbstractEbuildProcess.py | 2 +- lib/_emerge/EbuildPhase.py | 2 +- lib/portage/package/ebuild/_config/special_env_vars.py | 4 ++-- lib/portage/util/_async/BuildLogger.py | 2 +- man/make.conf.5 | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/NEWS b/NEWS index 5754aa24c..1108f2144 100644 --- a/NEWS +++ b/NEWS @@ -2,7 +2,7 @@ News (mainly features/major bug fixes) portage-2.3.90 -------------- -* The new PORTAGE_LOG_FILTER_FILE make.conf(5) variable specifies a +* The new PORTAGE_LOG_FILTER_FILE_CMD make.conf(5) variable specifies a command that filters build log output to a log file. In order to filter ANSI escape codes from build logs, ansifilter(1) is a convenient setting for this variable. diff --git a/RELEASE-NOTES b/RELEASE-NOTES index ff7793ebb..2d993bdca 100644 --- a/RELEASE-NOTES +++ b/RELEASE-NOTES @@ -12,7 +12,7 @@ portage-2.3.90 ================================== * Bug Fixes: - Bug 601252 DISTDIR NFS root_squash support - - Bug 709746 new PORTAGE_LOG_FILTER_FILE variable specifies a + - Bug 709746 new PORTAGE_LOG_FILTER_FILE_CMD variable specifies a command that filters build log output to a log file - Bug 710076 einstalldocs: Fix test for DOCS being unset 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). diff --git a/man/make.conf.5 b/man/make.conf.5 index baecd283a..467a9d394 100644 --- a/man/make.conf.5 +++ b/man/make.conf.5 @@ -979,7 +979,7 @@ with an integer pid. For example, a value of "ionice \-c 3 \-p \\${PID}" will set idle io priority. For more information about ionice, see \fBionice\fR(1). This variable is unset by default. .TP -.B PORTAGE_LOG_FILTER_FILE +.B PORTAGE_LOG_FILTER_FILE_CMD This variable specifies a command that filters build log output to a log file. In order to filter ANSI escape codes from build logs, \fBansifilter\fR(1) is a convenient setting for this variable.
