diff options
| author | Zac Medico <zmedico@gentoo.org> | 2006-06-08 13:26:55 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2006-06-08 13:26:55 +0000 |
| commit | a70eee90b48de75625e86135ed722cf9e5663740 (patch) | |
| tree | 6e321238a43f47f20720bad891ae887b894eb886 | |
| parent | f49d6cc82f7c4d8a16cd1708fe5df4a31d5f95e6 (diff) | |
| download | portage-a70eee90b48de75625e86135ed722cf9e5663740.tar.gz portage-a70eee90b48de75625e86135ed722cf9e5663740.tar.bz2 portage-a70eee90b48de75625e86135ed722cf9e5663740.zip | |
Move hard coding of /etc/env.d in CONFIG_PROTECT_MASK from portage.config.__getitem__() to make.globals. Thanks to pauldv for reporting.
svn path=/main/trunk/; revision=3470
| -rw-r--r-- | cnf/make.globals | 1 | ||||
| -rw-r--r-- | pym/portage.py | 4 |
2 files changed, 1 insertions, 4 deletions
diff --git a/cnf/make.globals b/cnf/make.globals index 227183626..72f717129 100644 --- 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 79271d36a..3742b708f 100644 --- 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): |