Move hard coding of /etc/env.d in CONFIG_PROTECT_MASK from portage.config.__getitem__...

svn path=/main/trunk/; revision=3470

diff --git a/cnf/make.globals b/cnf/make.globals
index 22718362626973a2c962c46a236369abdfe964e4..72f717129abcae6485e4da218c13e4c15e4af8a0 100644 (file)
--- a/cnf/make.globals
+++ b/cnf/make.globals
@@ -58,6 +58,7 @@ PORTAGE_RSYNC_OPTS="--recursive --links --safe-links --perms --times --compress
 
 # Minimal CONFIG_PROTECT
 CONFIG_PROTECT="/etc"
+CONFIG_PROTECT_MASK="/etc/env.d"
 
 # Hide USE flags that can't be changed easily.
 USE_EXPAND_HIDDEN="ELIBC KERNEL USERLAND"

diff --git a/pym/portage.py b/pym/portage.py
index 79271d36ae3275d1f989e88f9cfea009886a6d47..3742b708f7d1257445ab3991429d4972365f66fb 100644 (file)
--- a/pym/portage.py
+++ b/pym/portage.py
@@ -1750,10 +1750,6 @@ class config:
                        elif x.has_key(mykey):
                                match = x[mykey]
                                break
-
-               if mykey == "CONFIG_PROTECT_MASK":
-                       match += " /etc/env.d"
-
                return match
 
        def has_key(self,mykey):