From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1SFslm-0003tZ-93 for garchives@archives.gentoo.org; Thu, 05 Apr 2012 19:54:59 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C9437E064B; Thu, 5 Apr 2012 19:54:47 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 9380EE064B for ; Thu, 5 Apr 2012 19:54:47 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 0E2DA1B403A for ; Thu, 5 Apr 2012 19:54:47 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id CD625E5403 for ; Thu, 5 Apr 2012 19:54:45 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: <1333655668.16b378f99938e1940fe2d6e2a898632189374a62.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: pym/portage/package/ebuild/ X-VCS-Repository: proj/portage X-VCS-Files: pym/portage/package/ebuild/config.py X-VCS-Directories: pym/portage/package/ebuild/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 16b378f99938e1940fe2d6e2a898632189374a62 X-VCS-Branch: master Date: Thu, 5 Apr 2012 19:54:45 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 8f4cdc6f-0ce6-41ff-b325-70d487fa257b X-Archives-Hash: 742cff4ac43b909b8240058589c202b6 commit: 16b378f99938e1940fe2d6e2a898632189374a62 Author: Zac Medico gentoo org> AuthorDate: Thu Apr 5 19:54:28 2012 +0000 Commit: Zac Medico gentoo org> CommitDate: Thu Apr 5 19:54:28 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3D16b378f9 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 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pym/portage/package/ebuild/config.py b/pym/portage/package/e= build/config.py index 2cd21f3..38f15c0 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 =3D {} + + env_d =3D getconfig(os.path.join(eroot, "etc", "profile.env"), + expand=3DFalse) or {} + expand_map =3D env_d.copy() self._expand_map =3D expand_map =20 # Allow make.globals to set default paths relative to ${EPREFIX}. expand_map["EPREFIX"] =3D eprefix =20 - env_d =3D getconfig(os.path.join(eroot, "etc", "profile.env"), - expand=3DFalse) - make_globals =3D getconfig(os.path.join( self.global_config_path, 'make.globals'), expand=3Dexpand_map) if make_globals is None: