diff options
| author | Zac Medico <zmedico@gentoo.org> | 2012-05-16 13:02:47 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2012-05-16 13:02:47 -0700 |
| commit | 304dfb0fb09b799eec526d0703c44fc6a92ef13d (patch) | |
| tree | ba9d55910b38f5337e9aee01654b9fcca6339d22 | |
| parent | 9ebe11e40796c8d000a50eac0d9bce1f630c5668 (diff) | |
| download | portage-304dfb0fb09b799eec526d0703c44fc6a92ef13d.tar.gz portage-304dfb0fb09b799eec526d0703c44fc6a92ef13d.tar.bz2 portage-304dfb0fb09b799eec526d0703c44fc6a92ef13d.zip | |
FEATURES=config-protect-if-modified by default.
The plan is to send out a GLEP 42 news item for this before it goes to
stable, as discussed here:
http://archives.gentoo.org/gentoo-dev/msg_7fe557809defad4faca2ee5c6e52d134.xml
| -rw-r--r-- | RELEASE-NOTES | 6 | ||||
| -rw-r--r-- | cnf/make.globals | 3 | ||||
| -rw-r--r-- | man/make.conf.5 | 5 |
3 files changed, 11 insertions, 3 deletions
diff --git a/RELEASE-NOTES b/RELEASE-NOTES index 64dff1c13..8a35bd00e 100644 --- a/RELEASE-NOTES +++ b/RELEASE-NOTES @@ -20,6 +20,12 @@ portage-2.2 /var/lib/portage/world, has been extended to include nested sets that may be listed /var/lib/portage/world_sets. +portage-2.1.10.61 +================================== +* FEATURES=config-protect-if-modified is now enabled by default. This causes + the CONFIG_PROTECT behavior to be skipped for files that have not been + modified since they were installed. + portage-2.1.10.27 ================================== * FEATURES=fixpackages is now enabled unconditionally. Set --package-moves=n diff --git a/cnf/make.globals b/cnf/make.globals index 1717baf68..b1569885b 100644 --- a/cnf/make.globals +++ b/cnf/make.globals @@ -51,7 +51,8 @@ RESUMECOMMAND_SSH=${FETCHCOMMAND_SSH} FETCHCOMMAND_SFTP="bash -c \"x=\\\${2#sftp://} ; host=\\\${x%%/*} ; port=\\\${host##*:} ; host=\\\${host%:*} ; [[ \\\${host} = \\\${port} ]] && port=22 ; exec sftp -P \\\${port} \\\"\\\${host}:/\\\${x#*/}\\\" \\\"\\\$1\\\"\" sftp \"\${DISTDIR}/\${FILE}\" \"\${URI}\"" # Default user options -FEATURES="assume-digests binpkg-logs distlocks ebuild-locks +FEATURES="assume-digests binpkg-logs + config-protect-if-modified distlocks ebuild-locks fixlafiles news parallel-fetch parse-eapi-ebuild-head protect-owned sandbox sfperms strict unknown-features-warn unmerge-logs unmerge-orphans userfetch" diff --git a/man/make.conf.5 b/man/make.conf.5 index 9897073c6..a90e51dbb 100644 --- a/man/make.conf.5 +++ b/man/make.conf.5 @@ -1,4 +1,4 @@ -.TH "MAKE.CONF" "5" "Dec 2011" "Portage VERSION" "Portage" +.TH "MAKE.CONF" "5" "May 2012" "Portage VERSION" "Portage" .SH "NAME" make.conf \- custom settings for Portage .SH "SYNOPSIS" @@ -270,7 +270,8 @@ information (upon which this feature depends). .TP .B config\-protect\-if\-modified This causes the \fBCONFIG_PROTECT\fR behavior to be skipped for files -that have not been modified since they were installed. +that have not been modified since they were installed. This feature is +enabled by default. .TP .B digest Autogenerate digests for packages when running the |