From: Zac Medico Date: Mon, 27 Jun 2011 02:32:06 +0000 (-0700) Subject: Fix CONFIG_PROTECT breakage from previous commit. X-Git-Tag: v2.2.0_alpha42~28 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=33997cfc32cd9457e656c7ecbfab6ff5e2c62885;p=portage.git Fix CONFIG_PROTECT breakage from previous commit. --- 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