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/_emerge | |
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/_emerge')
-rw-r--r-- | pym/_emerge/Package.py | 11 | ||||
-rw-r--r-- | pym/_emerge/depgraph.py | 12 |
2 files changed, 9 insertions, 14 deletions
diff --git a/pym/_emerge/Package.py b/pym/_emerge/Package.py index e86eab334..58c453ff9 100644 --- a/pym/_emerge/Package.py +++ b/pym/_emerge/Package.py @@ -1,4 +1,4 @@ -# Copyright 1999-2009 Gentoo Foundation +# Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 import re @@ -6,8 +6,8 @@ import sys from itertools import chain import portage from portage.cache.mappings import slot_dict_class -from portage.dep import isvalidatom, paren_reduce, use_reduce, \ - paren_normalize, paren_enclose, _slot_re +from portage.dep import isvalidatom, use_reduce, \ + paren_enclose, _slot_re from _emerge.Task import Task if sys.hexversion >= 0x3000000: @@ -310,8 +310,7 @@ class _PackageMetadataWrapper(_PackageMetadataWrapperBase): if k in self._use_conditional_keys: if self._pkg.root_config.settings.local_config and '?' in v: try: - v = paren_enclose(paren_normalize(use_reduce( - paren_reduce(v), uselist=self._pkg.use.enabled))) + v = paren_enclose(use_reduce(v, uselist=self._pkg.use.enabled)) except portage.exception.InvalidDependString: # This error should already have been registered via # self._pkg._invalid_metadata(). @@ -336,7 +335,7 @@ class _PackageMetadataWrapper(_PackageMetadataWrapperBase): getattr(self, "_set_" + k.lower())(k, v) elif k in self._use_conditional_keys: try: - reduced = use_reduce(paren_reduce(v), matchall=1) + reduced = use_reduce(v, matchall=1) except portage.exception.InvalidDependString as e: self._pkg._invalid_metadata(k + ".syntax", "%s: %s" % (k, e)) else: diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py index e9f7c4426..10ad5e491 100644 --- a/pym/_emerge/depgraph.py +++ b/pym/_emerge/depgraph.py @@ -1208,10 +1208,8 @@ class depgraph(object): try: - dep_string = portage.dep.paren_normalize( - portage.dep.use_reduce( - portage.dep.paren_reduce(dep_string), - uselist=self._pkg_use_enabled(pkg))) + dep_string = portage.dep.use_reduce(dep_string, + uselist=self._pkg_use_enabled(pkg)) dep_string = list(self._queue_disjunctive_deps( pkg, dep_root, dep_priority, dep_string)) @@ -2628,10 +2626,8 @@ class depgraph(object): for key in "DEPEND", "RDEPEND", "PDEPEND", "LICENSE": dep = pkg.metadata[key] - old_val = set(portage.dep.paren_normalize( \ - portage.dep.use_reduce(portage.dep.paren_reduce(dep), pkg.use.enabled))) - new_val = set(portage.dep.paren_normalize( \ - portage.dep.use_reduce(portage.dep.paren_reduce(dep), new_use))) + old_val = set(portage.dep.use_reduce(dep, pkg.use.enabled)) + new_val = set(portage.dep.use_reduce(dep, new_use)) if old_val != new_val: return True |