Fix CONFIG_PROTECT breakage from previous commit.

diff --git a/pym/portage/package/ebuild/config.py b/pym/portage/package/ebuild/config.py
index c467efe814803cdb80677f6c400d1e4e23ae554b..19277d709ecab3d8c7b2ba4c87367edb46d3b06b 100644 (file)
--- 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