summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2008-07-15 22:31:13 +0000
committerZac Medico <zmedico@gentoo.org>2008-07-15 22:31:13 +0000
commit41a68fd862720cc610ba80551e4b87ac7beef893 (patch)
tree1cf5c5e9ae1e04f1393b6ca71340d22e3e4be24e
parent37a5c4f4c0e3fbb77a4056d437ea067d69ece2aa (diff)
downloadportage-41a68fd862720cc610ba80551e4b87ac7beef893.tar.gz
portage-41a68fd862720cc610ba80551e4b87ac7beef893.tar.bz2
portage-41a68fd862720cc610ba80551e4b87ac7beef893.zip
Make EbuildFetcher copy FETCHCOMMAND and RESUMECOMMAND to the fetch
environment, in case the default values have been overridden. svn path=/main/trunk/; revision=11062
-rw-r--r--pym/_emerge/__init__.py6
1 files changed, 6 insertions, 0 deletions
diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py
index ac8456358..7fe217b80 100644
--- a/pym/_emerge/__init__.py
+++ b/pym/_emerge/__init__.py
@@ -2137,6 +2137,8 @@ class EbuildFetcher(SpawnProcess):
__slots__ = ("fetchonly", "pkg",)
+ _env_vars = ("FETCHCOMMAND", "RESUMECOMMAND")
+
def _start(self):
root_config = self.pkg.root_config
@@ -2146,6 +2148,10 @@ class EbuildFetcher(SpawnProcess):
fetch_env = settings.environ()
fetch_env["PORTAGE_NICENESS"] = "0"
+ for k in self._env_vars:
+ v = settings.get(k)
+ if v is not None:
+ fetch_env[k] = v
if self.fetchonly:
fetch_env["PORTAGE_PARALLEL_FETCHONLY"] = "1"