Make EbuildFetcher copy FETCHCOMMAND and RESUMECOMMAND to the fetch
authorZac Medico <zmedico@gentoo.org>
Tue, 15 Jul 2008 22:31:13 +0000 (22:31 -0000)
committerZac Medico <zmedico@gentoo.org>
Tue, 15 Jul 2008 22:31:13 +0000 (22:31 -0000)
environment, in case the default values have been overridden.

svn path=/main/trunk/; revision=11062

pym/_emerge/__init__.py

index ac8456358d2087aa29ed61e2d8a24e9548c1f57a..7fe217b8055e0d92f18a98f31f7c921eba8b6f3a 100644 (file)
@@ -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"