Gentoo Archives: gentoo-commits

From: Zac Medico <zmedico@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/portage:master commit in: pym/portage/package/ebuild/
Date: Thu, 30 Aug 2012 16:43:36
Message-Id: 1346344989.f9922394bbb674b04f6bed38c1598e8e2e01906f.zmedico@gentoo
1 commit: f9922394bbb674b04f6bed38c1598e8e2e01906f
2 Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
3 AuthorDate: Thu Aug 30 16:43:09 2012 +0000
4 Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
5 CommitDate: Thu Aug 30 16:43:09 2012 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=f9922394
7
8 config.setcpv: fix early ret for IUSE_EFFECTIVE
9
10 ---
11 pym/portage/package/ebuild/config.py | 4 +++-
12 1 files changed, 3 insertions(+), 1 deletions(-)
13
14 diff --git a/pym/portage/package/ebuild/config.py b/pym/portage/package/ebuild/config.py
15 index e871382..8f3b59b 100644
16 --- a/pym/portage/package/ebuild/config.py
17 +++ b/pym/portage/package/ebuild/config.py
18 @@ -1243,6 +1243,7 @@ class config(object):
19 iuse = ""
20 pkg_configdict = self.configdict["pkg"]
21 previous_iuse = pkg_configdict.get("IUSE")
22 + previous_iuse_effective = pkg_configdict.get("IUSE_EFFECTIVE")
23 previous_features = pkg_configdict.get("FEATURES")
24
25 aux_keys = self._setcpv_aux_keys
26 @@ -1433,7 +1434,8 @@ class config(object):
27
28 # If reset() has not been called, it's safe to return
29 # early if IUSE has not changed.
30 - if not has_changed and previous_iuse == iuse:
31 + if not has_changed and previous_iuse == iuse and \
32 + (previous_iuse_effective is not None == eapi_attrs.iuse_effective):
33 return
34
35 # Filter out USE flags that aren't part of IUSE. This has to