diff options
| author | Zac Medico <zmedico@gentoo.org> | 2008-08-30 21:43:52 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2008-08-30 21:43:52 +0000 |
| commit | d995371c4689a9d541f543ce4aa7f89c938394ec (patch) | |
| tree | 4a483b300a490d4161c70ac55f2cda92653bc000 /cnf/make.globals | |
| parent | ed589e570b592a8aad5665f8763e947164abd1ce (diff) | |
| download | portage-d995371c4689a9d541f543ce4aa7f89c938394ec.tar.gz portage-d995371c4689a9d541f543ce4aa7f89c938394ec.tar.bz2 portage-d995371c4689a9d541f543ce4aa7f89c938394ec.zip | |
Add support for FEATURES="protect-owned" which is identical to the
collision-protect feature except that files may be overwritten if they are
not explicitly listed in the contents of a currently installed package.
This is particularly useful on systems that have lots of orphan files that
have been left behind by older versions of portage that did not support the
unmerge-orphans feature.
The additional tolerance makes this feature more suitable than
collision-protect for being enabled by default. In order to ensure smooth
operation of protect-owned in all cases, we also have to set
COLLISION_IGNORE="/lib/modules" since files inside this directory are
never unmerge. By enabling protect-owned by default, users are protected
from problems that may occur due interactions with file collisions and the
unmerge-orphans feature which is also enabled by default.
svn path=/main/trunk/; revision=11479
Diffstat (limited to 'cnf/make.globals')
| -rw-r--r-- | cnf/make.globals | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/cnf/make.globals b/cnf/make.globals index f379fb1c1..8b9db7a04 100644 --- a/cnf/make.globals +++ b/cnf/make.globals @@ -38,7 +38,13 @@ FETCHCOMMAND="/usr/bin/wget -t 5 -T 60 --passive-ftp -O \"\${DISTDIR}/\${FILE}\" RESUMECOMMAND="/usr/bin/wget -c -t 5 -T 60 --passive-ftp -O \"\${DISTDIR}/\${FILE}\" \"\${URI}\"" # Default user options -FEATURES="distlocks parallel-fetch sandbox sfperms strict unmerge-orphans userfetch" +FEATURES="distlocks parallel-fetch protect-owned sandbox + sfperms strict unmerge-orphans userfetch" + +# Ignore file collisions in /lib/modules since files inside this directory +# are never unmerged, and therefore collisions must be ignored in order for +# FEATURES=protect-owned to operate smoothly in all cases. +COLLISION_IGNORE="/lib/modules" # Enable for global testing FEATURES="${FEATURES} preserve-libs" |