Gentoo Archives: gentoo-commits

From: "Zac Medico (zmedico)" <zmedico@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] portage r11312 - main/trunk/pym/_emerge
Date: Fri, 01 Aug 2008 10:37:22
Message-Id: E1KOs0d-0000oL-Qq@stork.gentoo.org
1 Author: zmedico
2 Date: 2008-08-01 10:37:18 +0000 (Fri, 01 Aug 2008)
3 New Revision: 11312
4
5 Modified:
6 main/trunk/pym/_emerge/__init__.py
7 Log:
8 Make EbuildFetcher pass a copy of os.environ to the ebuild(1) subprocess so
9 that any incremental variables have been overridden are correctly considered
10 by the config instance in the subproccess.
11
12
13 Modified: main/trunk/pym/_emerge/__init__.py
14 ===================================================================
15 --- main/trunk/pym/_emerge/__init__.py 2008-08-01 10:14:39 UTC (rev 11311)
16 +++ main/trunk/pym/_emerge/__init__.py 2008-08-01 10:37:18 UTC (rev 11312)
17 @@ -2239,7 +2239,12 @@
18 if self.fetchall:
19 phase = "fetchall"
20
21 - fetch_env = dict(settings.iteritems())
22 + # If any incremental variables have been overridden
23 + # via the environment, those values need to be passed
24 + # along here so that they are correctly considered by
25 + # the config instance in the subproccess.
26 + fetch_env = os.environ.copy()
27 +
28 fetch_env["PORTAGE_NICENESS"] = "0"
29 if self.fetchonly:
30 fetch_env["PORTAGE_PARALLEL_FETCHONLY"] = "1"