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 51fc0b157950644c2c1bad0d6fc1dc5c7ad9e1ed..74a3380c1cee3f8829e1aa668a1badae4d90f7f4 100644 (file)
--- 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