| 1 |
commit: 33997cfc32cd9457e656c7ecbfab6ff5e2c62885 |
| 2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Jun 27 02:32:06 2011 +0000 |
| 4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Jun 27 02:32:06 2011 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=33997cfc |
| 7 |
|
| 8 |
Fix CONFIG_PROTECT breakage from previous commit. |
| 9 |
|
| 10 |
--- |
| 11 |
pym/portage/package/ebuild/config.py | 2 +- |
| 12 |
1 files changed, 1 insertions(+), 1 deletions(-) |
| 13 |
|
| 14 |
diff --git a/pym/portage/package/ebuild/config.py b/pym/portage/package/ebuild/config.py |
| 15 |
index c467efe..19277d7 100644 |
| 16 |
--- a/pym/portage/package/ebuild/config.py |
| 17 |
+++ b/pym/portage/package/ebuild/config.py |
| 18 |
@@ -434,6 +434,7 @@ class config(object): |
| 19 |
non_user_variables = set() |
| 20 |
non_user_variables.update(profile_only_variables) |
| 21 |
non_user_variables.update(self._env_blacklist) |
| 22 |
+ non_user_variables.update(self._global_only_vars) |
| 23 |
non_user_variables = frozenset(non_user_variables) |
| 24 |
self._non_user_variables = non_user_variables |
| 25 |
|
| 26 |
@@ -1209,7 +1210,6 @@ class config(object): |
| 27 |
|
| 28 |
protected_pkg_keys = set(pkg_configdict) |
| 29 |
protected_pkg_keys.discard('USE') |
| 30 |
- protected_pkg_keys.update(self._global_only_vars) |
| 31 |
|
| 32 |
# If there are _any_ package.env settings for this package |
| 33 |
# then it automatically triggers config.reset(), in order |
Archives