| 1 |
commit: d35ef931fb1152cee0d75815ef21c896c732a66c |
| 2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Mar 27 15:21:12 2013 +0000 |
| 4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Mar 27 15:21:12 2013 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=d35ef931 |
| 7 |
|
| 8 |
make.defaults: profile-formats control recursive |
| 9 |
|
| 10 |
--- |
| 11 |
pym/portage/package/ebuild/config.py | 10 +++++----- |
| 12 |
1 files changed, 5 insertions(+), 5 deletions(-) |
| 13 |
|
| 14 |
diff --git a/pym/portage/package/ebuild/config.py b/pym/portage/package/ebuild/config.py |
| 15 |
index 318bb3d..227d3a8 100644 |
| 16 |
--- a/pym/portage/package/ebuild/config.py |
| 17 |
+++ b/pym/portage/package/ebuild/config.py |
| 18 |
@@ -522,10 +522,10 @@ class config(object): |
| 19 |
self.unpack_dependencies = load_unpack_dependencies_configuration(self.repositories) |
| 20 |
|
| 21 |
mygcfg = {} |
| 22 |
- if self.profiles: |
| 23 |
- mygcfg_dlists = [getconfig(os.path.join(x, "make.defaults"), |
| 24 |
- tolerant=tolerant, expand=expand_map, recursive=True) |
| 25 |
- for x in self.profiles] |
| 26 |
+ if profiles_complex: |
| 27 |
+ mygcfg_dlists = [getconfig(os.path.join(x.location, "make.defaults"), |
| 28 |
+ tolerant=tolerant, expand=expand_map, recursive=x.portage1_directories) |
| 29 |
+ for x in profiles_complex] |
| 30 |
self._make_defaults = mygcfg_dlists |
| 31 |
mygcfg = stack_dicts(mygcfg_dlists, |
| 32 |
incrementals=self.incrementals) |
| 33 |
@@ -638,7 +638,7 @@ class config(object): |
| 34 |
self._repo_make_defaults = {} |
| 35 |
for repo in self.repositories.repos_with_profiles(): |
| 36 |
d = getconfig(os.path.join(repo.location, "profiles", "make.defaults"), |
| 37 |
- tolerant=tolerant, expand=self.configdict["globals"].copy(), recursive=True) or {} |
| 38 |
+ tolerant=tolerant, expand=self.configdict["globals"].copy(), recursive=repo.portage1_profiles) or {} |
| 39 |
if d: |
| 40 |
for k in chain(self._env_blacklist, |
| 41 |
profile_only_variables, self._global_only_vars): |
Archives