diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2011-06-26 19:32:06 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2011-06-26 19:32:06 -0700 |
| commit | 33997cfc32cd9457e656c7ecbfab6ff5e2c62885 (patch) | |
| tree | 4a60c897f2e0ce46faf81954c900b8ff0d28faec | |
| parent | config: disallow per-package/repo CONFIG_PROTECT (diff) | |
| download | portage-33997cfc32cd9457e656c7ecbfab6ff5e2c62885.tar.gz portage-33997cfc32cd9457e656c7ecbfab6ff5e2c62885.tar.bz2 portage-33997cfc32cd9457e656c7ecbfab6ff5e2c62885.zip | |
Fix CONFIG_PROTECT breakage from previous commit.
| -rw-r--r-- | pym/portage/package/ebuild/config.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pym/portage/package/ebuild/config.py b/pym/portage/package/ebuild/config.py index c467efe81..19277d709 100644 --- a/pym/portage/package/ebuild/config.py +++ b/pym/portage/package/ebuild/config.py @@ -434,6 +434,7 @@ class config(object): non_user_variables = set() non_user_variables.update(profile_only_variables) non_user_variables.update(self._env_blacklist) + non_user_variables.update(self._global_only_vars) non_user_variables = frozenset(non_user_variables) self._non_user_variables = non_user_variables @@ -1209,7 +1210,6 @@ class config(object): protected_pkg_keys = set(pkg_configdict) protected_pkg_keys.discard('USE') - protected_pkg_keys.update(self._global_only_vars) # If there are _any_ package.env settings for this package # then it automatically triggers config.reset(), in order |