From: Zac Medico <zmedico@gentoo.org>
Date: Mon, 23 Mar 2009 02:20:15 +0000 (-0000)
Subject: Inside config.environ(), skip stat call on $T/environment for phases such
X-Git-Tag: v2.1.6.10~9
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e0f6e327a88b649d54f450193946ca28bee43f25;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. (trunk r13143)

svn path=/main/branches/2.1.6/; revision=13160
---

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