From: Zac Medico <zmedico@gentoo.org>
Date: Thu, 25 Nov 2010 17:27:19 +0000 (-0800)
Subject: config.environ: filter calling env only if mycpv
X-Git-Tag: v2.1.9.25~10
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=b4b50c119e68b1da58c76a7ae5c8fddcb1a4794f;p=portage.git

config.environ: filter calling env only if mycpv
---

diff --git a/pym/portage/package/ebuild/config.py b/pym/portage/package/ebuild/config.py
index ffe1fe988..d4c69f805 100644
--- a/pym/portage/package/ebuild/config.py
+++ b/pym/portage/package/ebuild/config.py
@@ -2049,7 +2049,8 @@ class config(object):
 		eapi = self.get('EAPI')
 		phase = self.get('EBUILD_PHASE')
 		filter_calling_env = False
-		if phase not in ('clean', 'cleanrm', 'depend', 'fetch'):
+		if self.mycpv is not None and \
+			phase not in ('clean', 'cleanrm', 'depend', 'fetch'):
 			temp_dir = self.get('T')
 			if temp_dir is not None and \
 				os.path.exists(os.path.join(temp_dir, 'environment')):