From: Zac Medico <zmedico@gentoo.org>
Date: Sun, 22 Mar 2009 21:31:23 +0000 (-0000)
Subject: Inside config.environ(), skip stat call on $T/environment for phases such
X-Git-Tag: v2.2_rc27~13
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=66a25ee0b933016d5ffdb96326bb15cd1ef7b6b9;p=portage.git

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ński <peper@g.o> for reporting.

svn path=/main/trunk/; revision=13143
---

diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py
index c09fd552b..020a1a7ac 100644
--- a/pym/portage/__init__.py
+++ b/pym/portage/__init__.py
@@ -2987,11 +2987,13 @@ class config(object):
 		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 @@ class config(object):
 			mydict["HOME"]=mydict["BUILD_PREFIX"][:]
 
 		if filter_calling_env:
-			phase = self.get("EBUILD_PHASE")
 			if phase:
 				whitelist = []
 				if "rpm" == phase: