diff options
| author |   Tim Harder <radhermit@gmail.com> | 2015-02-21 12:02:19 -0500 |
|---|---|---|
| committer | Tim Harder <radhermit@gmail.com> | 2015-02-21 12:02:19 -0500 |
| commit | a068bd75afc2f04ca06374038a9f3beaba283edf (patch) | |
| tree | 3266f17b42f2653d901f3b757a7a2f0dc3e44b37 | |
| parent | pmerge: remove references to -s set syntax (diff) | |
| download | pkgcore-a068bd75afc2f04ca06374038a9f3beaba283edf.tar.gz pkgcore-a068bd75afc2f04ca06374038a9f3beaba283edf.tar.bz2 pkgcore-a068bd75afc2f04ca06374038a9f3beaba283edf.zip | |
profiles: expand valid USE_EXPAND flags for IUSE_EFFECTIVE in EAPI < 5
It seems more correct this way instead of relying on expanding the globs
later when they are applied.
| -rw-r--r-- | pkgcore/ebuild/profiles.py | 4 | ||||
| -rw-r--r-- | pkgcore/test/ebuild/test_profiles.py | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/pkgcore/ebuild/profiles.py b/pkgcore/ebuild/profiles.py index dafdc91e1..2966e16b2 100644 --- a/pkgcore/ebuild/profiles.py +++ b/pkgcore/ebuild/profiles.py @@ -579,7 +579,9 @@ class ProfileStack(object): iuse_effective.append(v.lower() + "_" + x) else: iuse_effective.extend(profile.repoconfig.known_arches) - iuse_effective.extend(x.lower() + "_.*" for x in self.use_expand) + for v in self.use_expand: + for x in self.default_env.get("USE_EXPAND_VALUES_" + v, "").split(): + iuse_effective.append(v.lower() + "_" + x) return frozenset(iuse_effective) diff --git a/pkgcore/test/ebuild/test_profiles.py b/pkgcore/test/ebuild/test_profiles.py index d7d8a71b3..8ea2f29a4 100644 --- a/pkgcore/test/ebuild/test_profiles.py +++ b/pkgcore/test/ebuild/test_profiles.py @@ -1223,7 +1223,7 @@ class TestOnDiskProfile(profile_mixin, TestCase): frozenset(['amd64', 'arm'])) self.assertEqual( self.get_profile('1', basepath).iuse_effective, - frozenset(['amd64', 'arm', 'abi_x86_.*', 'elibc_.*'])) + frozenset(['amd64', 'arm', 'elibc_glibc', 'elibc_uclibc'])) self.assertEqual( self.get_profile('2', basepath).iuse_effective, frozenset(['abi_x86_64', 'foo', 'amd64', 'arm', 'abi_x86_64', |