diff options
| author | Sebastian Luther <SebastianLuther@gmx.de> | 2010-08-10 21:09:09 +0200 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2010-08-10 22:28:57 -0700 |
| commit | 047f52b5d439573cc673a189096ba33c1817b882 (patch) | |
| tree | 799ffd1c26b3e4e4b15a7a668f81ec479af5f0e7 /pym/portage/dbapi/bintree.py | |
| parent | 2fe8c1c1aecc38079321cbe8bcdc75da31dbacc8 (diff) | |
| download | portage-047f52b5d439573cc673a189096ba33c1817b882.tar.gz portage-047f52b5d439573cc673a189096ba33c1817b882.tar.bz2 portage-047f52b5d439573cc673a189096ba33c1817b882.zip | |
portage.dep.use_reduce: Work on depstrings instead of paren_reduce'd dep arrays
This change makes paren_reduce and paren_normalize calls for use_reduce redundant,
resp. wrong. All consumers inside portage are adopted.
Diffstat (limited to 'pym/portage/dbapi/bintree.py')
| -rw-r--r-- | pym/portage/dbapi/bintree.py | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/pym/portage/dbapi/bintree.py b/pym/portage/dbapi/bintree.py index 31bb5f4ab..7dd179ce9 100644 --- a/pym/portage/dbapi/bintree.py +++ b/pym/portage/dbapi/bintree.py @@ -18,6 +18,7 @@ portage.proxy.lazyimport.lazyimport(globals(), from portage.cache.mappings import slot_dict_class from portage.dbapi.virtual import fakedbapi +from portage.dep import use_reduce, paren_enclose from portage.exception import InvalidPackageName, \ PermissionDenied, PortageException from portage.localization import _ @@ -1102,13 +1103,10 @@ class binarytree(object): use = [f for f in use if f in iuse] use.sort() metadata["USE"] = " ".join(use) - from portage.dep import paren_reduce, use_reduce, \ - paren_normalize, paren_enclose for k in self._pkgindex_use_evaluated_keys: try: - deps = paren_reduce(metadata[k]) + deps = metadata[k] deps = use_reduce(deps, uselist=raw_use) - deps = paren_normalize(deps) deps = paren_enclose(deps) except portage.exception.InvalidDependString as e: writemsg("%s: %s\n" % (k, str(e)), |