diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2012-08-30 09:43:09 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2012-08-30 09:43:09 -0700 |
| commit | f9922394bbb674b04f6bed38c1598e8e2e01906f (patch) | |
| tree | 80b745ffa542c172f980621b673793b354149454 | |
| parent | dyn_prepare: init state for apply_user_patches (diff) | |
| download | portage-f9922394bbb674b04f6bed38c1598e8e2e01906f.tar.gz portage-f9922394bbb674b04f6bed38c1598e8e2e01906f.tar.bz2 portage-f9922394bbb674b04f6bed38c1598e8e2e01906f.zip | |
config.setcpv: fix early ret for IUSE_EFFECTIVE
| -rw-r--r-- | pym/portage/package/ebuild/config.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/pym/portage/package/ebuild/config.py b/pym/portage/package/ebuild/config.py index e87138203..8f3b59bc9 100644 --- a/pym/portage/package/ebuild/config.py +++ b/pym/portage/package/ebuild/config.py @@ -1243,6 +1243,7 @@ class config(object): iuse = "" pkg_configdict = self.configdict["pkg"] previous_iuse = pkg_configdict.get("IUSE") + previous_iuse_effective = pkg_configdict.get("IUSE_EFFECTIVE") previous_features = pkg_configdict.get("FEATURES") aux_keys = self._setcpv_aux_keys @@ -1433,7 +1434,8 @@ class config(object): # If reset() has not been called, it's safe to return # early if IUSE has not changed. - if not has_changed and previous_iuse == iuse: + if not has_changed and previous_iuse == iuse and \ + (previous_iuse_effective is not None == eapi_attrs.iuse_effective): return # Filter out USE flags that aren't part of IUSE. This has to |