From 16b378f99938e1940fe2d6e2a898632189374a62 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Thu, 5 Apr 2012 12:54:28 -0700 Subject: config: populate expand map with profile.env This behavior got disabled by commit ed8a457e265ea1c23b66aeb12d00f1abd3d79e60, and now it's restored. --- pym/portage/package/ebuild/config.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'pym') 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: -- cgit v1.2.3-1-g7c22