diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2012-04-05 12:54:28 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2012-04-05 12:54:28 -0700 |
| commit | 16b378f99938e1940fe2d6e2a898632189374a62 (patch) | |
| tree | b56a3ee89114c073fb212131186bce24e8673ad3 | |
| parent | Limit long slot conflict loop for bug #410801. (diff) | |
| download | portage-16b378f99938e1940fe2d6e2a898632189374a62.tar.gz portage-16b378f99938e1940fe2d6e2a898632189374a62.tar.bz2 portage-16b378f99938e1940fe2d6e2a898632189374a62.zip | |
config: populate expand map with profile.env
This behavior got disabled by commit
ed8a457e265ea1c23b66aeb12d00f1abd3d79e60, and now it's restored.
| -rw-r--r-- | pym/portage/package/ebuild/config.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pym/portage/package/ebuild/config.py b/pym/portage/package/ebuild/config.py index 2cd21f3c9..38f15c081 100644 --- a/pym/portage/package/ebuild/config.py +++ b/pym/portage/package/ebuild/config.py @@ -313,15 +313,15 @@ class config(object): # Notably absent is "env", since we want to avoid any # interaction with the calling environment that might # lead to unexpected results. - expand_map = {} + + env_d = getconfig(os.path.join(eroot, "etc", "profile.env"), + expand=False) or {} + expand_map = env_d.copy() self._expand_map = expand_map # Allow make.globals to set default paths relative to ${EPREFIX}. expand_map["EPREFIX"] = eprefix - env_d = getconfig(os.path.join(eroot, "etc", "profile.env"), - expand=False) - make_globals = getconfig(os.path.join( self.global_config_path, 'make.globals'), expand=expand_map) if make_globals is None: |