From: Zac Medico <zmedico@gentoo.org>
Date: Fri, 1 Aug 2008 10:37:18 +0000 (-0000)
Subject: Make EbuildFetcher pass a copy of os.environ to the ebuild(1) subprocess so
X-Git-Tag: v2.2_rc6
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=1ab8e8ca080905e198af8bdae475471178987ff6;p=portage.git

Make EbuildFetcher pass a copy of os.environ to the ebuild(1) subprocess so
that any incremental variables have been overridden are correctly considered
by the config instance in the subproccess.

svn path=/main/trunk/; revision=11312
---

diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py
index a401e7e09..19c86ff4e 100644
--- a/pym/_emerge/__init__.py
+++ b/pym/_emerge/__init__.py
@@ -2239,7 +2239,12 @@ class EbuildFetcher(SpawnProcess):
 		if self.fetchall:
 			phase = "fetchall"
 
-		fetch_env = dict(settings.iteritems())
+		# If any incremental variables have been overridden
+		# via the environment, those values need to be passed
+		# along here so that they are correctly considered by
+		# the config instance in the subproccess.
+		fetch_env = os.environ.copy()
+
 		fetch_env["PORTAGE_NICENESS"] = "0"
 		if self.fetchonly:
 			fetch_env["PORTAGE_PARALLEL_FETCHONLY"] = "1"