summaryrefslogtreecommitdiffstats
path: root/cnf
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2011-05-07 21:34:25 -0700
committerZac Medico <zmedico@gentoo.org>2011-05-07 21:34:25 -0700
commite414b8571fed1e0da1a03e0a9719b580e21f7558 (patch)
treed8c6824ddf96c489bde73285363240ac35e8ca5e /cnf
parentdffb2901d349a66bdbba30423c358da7c9938e47 (diff)
downloadportage-e414b8571fed1e0da1a03e0a9719b580e21f7558.tar.gz
portage-e414b8571fed1e0da1a03e0a9719b580e21f7558.tar.bz2
portage-e414b8571fed1e0da1a03e0a9719b580e21f7558.zip
Rename FEATURES=no-ebuild-locks to ebuild-locks.
Diffstat (limited to 'cnf')
-rw-r--r--cnf/make.globals2
1 files changed, 1 insertions, 1 deletions
diff --git a/cnf/make.globals b/cnf/make.globals
index bcad5deb6..2258fd2f2 100644
--- a/cnf/make.globals
+++ b/cnf/make.globals
@@ -51,7 +51,7 @@ 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 fixpackages
+FEATURES="assume-digests binpkg-logs distlocks ebuild-locks fixpackages
fixlafiles news parallel-fetch protect-owned
sandbox sfperms strict unknown-features-warn unmerge-logs
unmerge-orphans userfetch"