From 304dfb0fb09b799eec526d0703c44fc6a92ef13d Mon Sep 17 00:00:00 2001
From: Zac Medico <zmedico@gentoo.org>
Date: Wed, 16 May 2012 13:02:47 -0700
Subject: 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
---
 cnf/make.globals | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'cnf')

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"
-- 
cgit v1.2.3-65-gdbad