aboutsummaryrefslogtreecommitdiff
path: root/cnf
diff options
context:
space:
mode:
authorM. J. Everitt <m.j.everitt@iee.org>2018-12-15 01:50:17 +0000
committerZac Medico <zmedico@gentoo.org>2018-12-19 20:24:29 -0800
commit4fc481827a27a2f83ccc466ec4b47057a8ec949b (patch)
tree6f4fec893e73fe4ddeabb9237d57790f1daad72d /cnf
parentExtractKernelVersion: use KeyValuePairFileLoader (bug 673224) (diff)
downloadportage-4fc481827a27a2f83ccc466ec4b47057a8ec949b.tar.gz
portage-4fc481827a27a2f83ccc466ec4b47057a8ec949b.tar.bz2
portage-4fc481827a27a2f83ccc466ec4b47057a8ec949b.zip
Renamed PORT_LOGDIR[_CLEAN] to PORTAGE_LOGDIR[_CLEAN]
To match similar existing PORTAGE_* variables Suggested-by: Zac Medico <zmedico@gentoo.org> Acked-by: Michael Everitt <m.j.everitt@iee.org> Bug: https://bugs.gentoo.org/668538 Signed-off-by: Zac Medico <zmedico@gentoo.org>
Diffstat (limited to 'cnf')
-rw-r--r--cnf/make.conf.example12
-rw-r--r--cnf/make.globals2
2 files changed, 7 insertions, 7 deletions
diff --git a/cnf/make.conf.example b/cnf/make.conf.example
index 36fc9a8e4..ffebd24d4 100644
--- a/cnf/make.conf.example
+++ b/cnf/make.conf.example
@@ -130,13 +130,13 @@
# storage. See the PORTDIR documentation for more information.
#PKGDIR=/usr/portage/packages
#
-# PORT_LOGDIR is the location where portage will store all the logs it
+# PORTAGE_LOGDIR is the location where portage will store all the logs it
# creates from each individual merge. They are stored as
# ${CATEGORY}:${PF}:YYYYMMDD-HHMMSS.log in the directory specified.
# If the directory does not exist, it will be created automatically and
# group permissions will be applied to it. If the directory already
# exists, portage will not modify its permissions.
-#PORT_LOGDIR=""
+#PORTAGE_LOGDIR=""
#
# PORTDIR_OVERLAY is a directory where local ebuilds may be stored without
# concern that they will be deleted by rsync updates. Default is not
@@ -306,16 +306,16 @@
# PORTAGE_ELOG_SYSTEM: selects the module(s) to process the log messages. Modules
# included in portage are (empty means logging is disabled):
# echo (display messages again when emerge exits)
-# save (saves one log per package in $PORT_LOGDIR/elog,
-# /var/log/portage/elog if $PORT_LOGDIR is unset)
+# save (saves one log per package in $PORTAGE_LOGDIR/elog,
+# /var/log/portage/elog if $PORTAGE_LOGDIR is unset)
# custom (passes all messages to $PORTAGE_ELOG_COMMAND)
# syslog (sends all messages to syslog)
# mail (send all messages to the mailserver defined
# in $PORTAGE_ELOG_MAILURI)
# save_summary (like "save" but merges all messages
-# in $PORT_LOGDIR/elog/summary.log,
+# in $PORTAGE_LOGDIR/elog/summary.log,
# /var/log/portage/elog/summary.log if
-# $PORT_LOGDIR is unset)
+# $PORTAGE_LOGDIR is unset)
# mail_summary (like "mail" but sends all messages in
# a single mail when emerge exits)
# To use elog you should enable at least one module
diff --git a/cnf/make.globals b/cnf/make.globals
index 1bcc7ce64..5a3015ae2 100644
--- a/cnf/make.globals
+++ b/cnf/make.globals
@@ -101,7 +101,7 @@ PORTAGE_RSYNC_OPTS="--recursive --links --safe-links --perms --times --omit-dir-
PORTAGE_SYNC_STALE="30"
# Executed before emerge exit if FEATURES=clean-logs is enabled.
-PORT_LOGDIR_CLEAN="find \"\${PORT_LOGDIR}\" -type f ! -name \"summary.log*\" -mtime +7 -delete"
+PORTAGE_LOGDIR_CLEAN="find \"\${PORTAGE_LOGDIR}\" -type f ! -name \"summary.log*\" -mtime +7 -delete"
# Minimal CONFIG_PROTECT
CONFIG_PROTECT="/etc"