Note: Due to technical difficulties, the Archives are currently not up to date.
GMANE provides an alternative service for most mailing lists. c.f. bug 424647
Author: zmedico
Date: 2009-03-22 21:31:23 +0000 (Sun, 22 Mar 2009)
New Revision: 13143
Modified:
main/trunk/pym/portage/__init__.py
Log:
Inside config.environ(), skip stat call on $T/environment for phases such
as 'clean' and 'depend' where environment filtering isn't needed. Thanks to
Piotr Jaroszy?\197?\132ski <peper@g.o> for reporting.
Modified: main/trunk/pym/portage/__init__.py
===================================================================
--- main/trunk/pym/portage/__init__.py 2009-03-22 08:42:19 UTC (rev 13142)
+++ main/trunk/pym/portage/__init__.py 2009-03-22 21:31:23 UTC (rev 13143)
@@ -2987,11 +2987,13 @@
mydict={}
environ_filter = self._environ_filter
+ phase = self.get('EBUILD_PHASE')
filter_calling_env = False
- temp_dir = self.get("T")
- if temp_dir is not None and \
- os.path.exists(os.path.join(temp_dir, "environment")):
- filter_calling_env = True
+ if phase not in ('clean', 'cleanrm', 'depend'):
+ temp_dir = self.get('T')
+ if temp_dir is not None and \
+ os.path.exists(os.path.join(temp_dir, 'environment')):
+ filter_calling_env = True
environ_whitelist = self._environ_whitelist
env_d = self.configdict["env.d"]
@@ -3017,7 +3019,6 @@
mydict["HOME"]=mydict["BUILD_PREFIX"][:]
if filter_calling_env:
- phase = self.get("EBUILD_PHASE")
if phase:
whitelist = []
if "rpm" == phase:
|
|
