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 a401e7e0997b36ad1c0a6874a3fb525337c0bbae..19c86ff4e9f0f05aaeee2ff4fd7070a9c3b0d3ce 100644 (file)
--- 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"