summaryrefslogtreecommitdiffstats
path: root/pym
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2008-08-01 10:37:18 +0000
committerZac Medico <zmedico@gentoo.org>2008-08-01 10:37:18 +0000
commit1ab8e8ca080905e198af8bdae475471178987ff6 (patch)
treede538899884efce16f81146488c7a16e1836d522 /pym
parent1628c616ba49a4034f8ae93a49f2f37332deb771 (diff)
downloadportage-1ab8e8ca080905e198af8bdae475471178987ff6.tar.gz
portage-1ab8e8ca080905e198af8bdae475471178987ff6.tar.bz2
portage-1ab8e8ca080905e198af8bdae475471178987ff6.zip
Make EbuildFetcher pass a copy of os.environ to the ebuild(1) subprocess sov2.2_rc6
that any incremental variables have been overridden are correctly considered by the config instance in the subproccess. svn path=/main/trunk/; revision=11312
Diffstat (limited to 'pym')
-rw-r--r--pym/_emerge/__init__.py7
1 files changed, 6 insertions, 1 deletions
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"