| 1 |
commit: 86f285fe9c94e2a817de077eda7e8744130c412f |
| 2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Jun 30 07:34:35 2011 +0000 |
| 4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Jun 30 07:34:35 2011 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=86f285fe |
| 7 |
|
| 8 |
config: filter repo-level make.defaults earlier |
| 9 |
|
| 10 |
--- |
| 11 |
pym/portage/package/ebuild/config.py | 9 +++++---- |
| 12 |
1 files changed, 5 insertions(+), 4 deletions(-) |
| 13 |
|
| 14 |
diff --git a/pym/portage/package/ebuild/config.py b/pym/portage/package/ebuild/config.py |
| 15 |
index d553a7b..8b1a1a1 100644 |
| 16 |
--- a/pym/portage/package/ebuild/config.py |
| 17 |
+++ b/pym/portage/package/ebuild/config.py |
| 18 |
@@ -6,6 +6,7 @@ __all__ = [ |
| 19 |
] |
| 20 |
|
| 21 |
import copy |
| 22 |
+from itertools import chain |
| 23 |
import logging |
| 24 |
import re |
| 25 |
import sys |
| 26 |
@@ -520,8 +521,10 @@ class config(object): |
| 27 |
for repo in self.repositories.repos_with_profiles(): |
| 28 |
d = getconfig(os.path.join(repo.location, "profiles", "make.defaults"), |
| 29 |
expand=self.configdict["globals"].copy()) or {} |
| 30 |
- for blacklisted in self._env_blacklist: |
| 31 |
- d.pop(blacklisted, None) |
| 32 |
+ if d: |
| 33 |
+ for k in chain(self._env_blacklist, |
| 34 |
+ profile_only_variables, self._global_only_vars): |
| 35 |
+ d.pop(k, None) |
| 36 |
self._repo_make_defaults[repo.name] = d |
| 37 |
|
| 38 |
#Read package.keywords and package.accept_keywords. |
| 39 |
@@ -1143,8 +1146,6 @@ class config(object): |
| 40 |
# make a copy, since we might modify it with |
| 41 |
# package.use settings |
| 42 |
d = d.copy() |
| 43 |
- for k in self._global_only_vars: |
| 44 |
- d.pop(k, None) |
| 45 |
cpdict = self._use_manager._repo_puse_dict.get(repo, {}).get(cp) |
| 46 |
if cpdict: |
| 47 |
repo_puse = ordered_by_atom_specificity(cpdict, pkg) |
Archives