| 1 |
commit: 16b378f99938e1940fe2d6e2a898632189374a62 |
| 2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Apr 5 19:54:28 2012 +0000 |
| 4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Apr 5 19:54:28 2012 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=16b378f9 |
| 7 |
|
| 8 |
config: populate expand map with profile.env |
| 9 |
|
| 10 |
This behavior got disabled by commit |
| 11 |
ed8a457e265ea1c23b66aeb12d00f1abd3d79e60, and now it's restored. |
| 12 |
|
| 13 |
--- |
| 14 |
pym/portage/package/ebuild/config.py | 8 ++++---- |
| 15 |
1 files changed, 4 insertions(+), 4 deletions(-) |
| 16 |
|
| 17 |
diff --git a/pym/portage/package/ebuild/config.py b/pym/portage/package/ebuild/config.py |
| 18 |
index 2cd21f3..38f15c0 100644 |
| 19 |
--- a/pym/portage/package/ebuild/config.py |
| 20 |
+++ b/pym/portage/package/ebuild/config.py |
| 21 |
@@ -313,15 +313,15 @@ class config(object): |
| 22 |
# Notably absent is "env", since we want to avoid any |
| 23 |
# interaction with the calling environment that might |
| 24 |
# lead to unexpected results. |
| 25 |
- expand_map = {} |
| 26 |
+ |
| 27 |
+ env_d = getconfig(os.path.join(eroot, "etc", "profile.env"), |
| 28 |
+ expand=False) or {} |
| 29 |
+ expand_map = env_d.copy() |
| 30 |
self._expand_map = expand_map |
| 31 |
|
| 32 |
# Allow make.globals to set default paths relative to ${EPREFIX}. |
| 33 |
expand_map["EPREFIX"] = eprefix |
| 34 |
|
| 35 |
- env_d = getconfig(os.path.join(eroot, "etc", "profile.env"), |
| 36 |
- expand=False) |
| 37 |
- |
| 38 |
make_globals = getconfig(os.path.join( |
| 39 |
self.global_config_path, 'make.globals'), expand=expand_map) |
| 40 |
if make_globals is None: |
Archives