aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2010-08-26 11:29:37 -0700
committerZac Medico <zmedico@gentoo.org>2010-08-26 11:29:37 -0700
commit944c1d7a84f8d27781dd7769ba0b324fbd4d3290 (patch)
tree259c07081a515513b9ba6a1db7920f4338919a65 /pym/portage/dbapi/bintree.py
parentRemove unused max_parents variable. (diff)
downloadportage-944c1d7a84f8d27781dd7769ba0b324fbd4d3290.tar.gz
portage-944c1d7a84f8d27781dd7769ba0b324fbd4d3290.tar.bz2
portage-944c1d7a84f8d27781dd7769ba0b324fbd4d3290.zip
Fix breakage in use_reduce() calls where token_class=Atom is incorrect.
Diffstat (limited to 'pym/portage/dbapi/bintree.py')
-rw-r--r--pym/portage/dbapi/bintree.py7
1 files changed, 6 insertions, 1 deletions
diff --git a/pym/portage/dbapi/bintree.py b/pym/portage/dbapi/bintree.py
index b4e240783..8cb59255d 100644
--- a/pym/portage/dbapi/bintree.py
+++ b/pym/portage/dbapi/bintree.py
@@ -1085,9 +1085,14 @@ class binarytree(object):
use.sort()
metadata["USE"] = " ".join(use)
for k in self._pkgindex_use_evaluated_keys:
+ if k.endswith('DEPEND'):
+ token_class = Atom
+ else:
+ token_class = None
+
try:
deps = metadata[k]
- deps = use_reduce(deps, uselist=raw_use, token_class=Atom)
+ deps = use_reduce(deps, uselist=raw_use, token_class=token_class)
deps = paren_enclose(deps)
except portage.exception.InvalidDependString as e:
writemsg("%s: %s\n" % (k, str(e)),