Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/portage:master commit in: pym/portage/package/ebuild/
Date: Mon, 05 Feb 2018 19:25:38
Message-Id: 1517858692.19ba736dabd1ade71ce7dc10f27d465e9a9af770.mgorny@gentoo
1 commit: 19ba736dabd1ade71ce7dc10f27d465e9a9af770
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Fri May 20 22:01:45 2016 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Mon Feb 5 19:24:52 2018 +0000
6 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=19ba736d
7
8 portage.package.ebuild.config: Rename iuse_implicit -> iuse_effective
9
10 Rename the iuse_implicit variable used in USE_EXPAND handling to
11 iuse_effective, since that is what is actually passed there. Correct
12 naming makes figuring out what the function does much easier.
13
14 Reviewed-by: Zac Medico <zmedico <AT> gentoo.org>
15
16 pym/portage/package/ebuild/config.py | 6 +++---
17 1 file changed, 3 insertions(+), 3 deletions(-)
18
19 diff --git a/pym/portage/package/ebuild/config.py b/pym/portage/package/ebuild/config.py
20 index 5624e86d3..35cf4f614 100644
21 --- a/pym/portage/package/ebuild/config.py
22 +++ b/pym/portage/package/ebuild/config.py
23 @@ -1307,13 +1307,13 @@ class config(object):
24 """
25
26 def __init__(self, settings, unfiltered_use,
27 - use, usemask, iuse_implicit,
28 + use, usemask, iuse_effective,
29 use_expand_split, use_expand_dict):
30 self._settings = settings
31 self._unfiltered_use = unfiltered_use
32 self._use = use
33 self._usemask = usemask
34 - self._iuse_implicit = iuse_implicit
35 + self._iuse_effective = iuse_effective
36 self._use_expand_split = use_expand_split
37 self._use_expand_dict = use_expand_dict
38
39 @@ -1331,7 +1331,7 @@ class config(object):
40 if has_wildcard:
41 var_split = [ x for x in var_split if x != "*" ]
42 has_iuse = set()
43 - for x in self._iuse_implicit:
44 + for x in self._iuse_effective:
45 if x[:prefix_len] == prefix:
46 has_iuse.add(x[prefix_len:])
47 if has_wildcard: