Skip to content

Commit

Permalink
Rename PORTAGE_LOG_FILTER_FILE_CMD from PORTAGE_LOG_FILTER_FILE
Browse files Browse the repository at this point in the history
Suggested-by: Michael 'veremitz' Everitt <gentoo@veremit.xyz>
Bug: https://bugs.gentoo.org/709746
Signed-off-by: Zac Medico <zmedico@gentoo.org>
  • Loading branch information
zmedico committed Mar 3, 2020
1 parent e762752 commit e24859e
Show file tree
Hide file tree
Showing 7 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion NEWS
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion RELEASE-NOTES
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion lib/_emerge/AbstractEbuildProcess.py
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ def _async_start(self):
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)
Expand Down
2 changes: 1 addition & 1 deletion lib/_emerge/EbuildPhase.py
Original file line number Diff line number Diff line change
Expand Up @@ -420,7 +420,7 @@ def _elog(self, elog_funcname, lines, background=None):
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
Expand Down
4 changes: 2 additions & 2 deletions lib/portage/package/ebuild/_config/special_env_vars.py
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@
"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",
Expand Down Expand Up @@ -205,7 +205,7 @@
}

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
Expand Down
2 changes: 1 addition & 1 deletion lib/portage/util/_async/BuildLogger.py
Original file line number Diff line number Diff line change
Expand Up @@ -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).
Expand Down
2 changes: 1 addition & 1 deletion man/make.conf.5
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down

0 comments on commit e24859e

Please sign in to comment.