diff options
| author | Zac Medico <zmedico@gentoo.org> | 2007-11-04 08:10:29 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2007-11-04 08:10:29 +0000 |
| commit | 3a33e056cffbab0d1c03299c4f568a259dcee55a (patch) | |
| tree | 66fd1ee30209963405c9cfd2d12ac93f2a47e55a /pym | |
| parent | 52f89f29a3c72f821dd6e78ce591cc3bdbf2ae42 (diff) | |
| download | portage-3a33e056cffbab0d1c03299c4f568a259dcee55a.tar.gz portage-3a33e056cffbab0d1c03299c4f568a259dcee55a.tar.bz2 portage-3a33e056cffbab0d1c03299c4f568a259dcee55a.zip | |
When evaluating *DEPEND conditionals for the Packages metadata
index, do not use IUSE to filter USE since there is currently
no guarantee that IUSE properly defines all of the necessary
flags.
svn path=/main/trunk/; revision=8420
Diffstat (limited to 'pym')
| -rw-r--r-- | pym/portage/dbapi/bintree.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/pym/portage/dbapi/bintree.py b/pym/portage/dbapi/bintree.py index 2b23cc763..9cb54274c 100644 --- a/pym/portage/dbapi/bintree.py +++ b/pym/portage/dbapi/bintree.py @@ -803,6 +803,7 @@ class binarytree(object): metadata["DESC"] = metadata["DESCRIPTION"] del metadata["DESCRIPTION"] use = metadata["USE"].split() + raw_use = use iuse = set(metadata["IUSE"].split()) use = [f for f in use if f in iuse] use.sort() @@ -812,7 +813,7 @@ class binarytree(object): for k in "LICENSE", "RDEPEND", "DEPEND", "PDEPEND", "PROVIDE": try: deps = paren_reduce(metadata[k]) - deps = use_reduce(deps, uselist=use) + deps = use_reduce(deps, uselist=raw_use) deps = paren_normalize(deps) deps = paren_enclose(deps) except portage.exception.InvalidDependString, e: |