From: Zac Medico <zmedico@gentoo.org>
Date: Sat, 21 Aug 2010 01:21:00 +0000 (-0700)
Subject: Fix config.setcpv() so it only calls _grab_pkg_env when there are
X-Git-Tag: v2.2_rc68~45
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=492694992a25b3fd7c3db4c304cd72ba53c7cdb9;p=portage.git

Fix config.setcpv() so it only calls _grab_pkg_env when there are
relevant package.env settings.
---

diff --git a/pym/portage/package/ebuild/config.py b/pym/portage/package/ebuild/config.py
index 51fc0b157..74a3380c1 100644
--- a/pym/portage/package/ebuild/config.py
+++ b/pym/portage/package/ebuild/config.py
@@ -1688,7 +1688,7 @@ class config(object):
 		# to account for possible incremental interaction between
 		# package.use, package.env, and overrides from the calling
 		# environment (configdict['env']).
-		if oldpenv != self._penv or self._penv:
+		if self._penv:
 			has_changed = True
 			# USE is special because package.use settings override
 			# it. Discard any package.use settings here and they'll