diff options
| author | Zac Medico <zmedico@gentoo.org> | 2010-08-18 06:36:21 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2010-08-18 06:36:21 -0700 |
| commit | ebee561758d81d7f3376ce316ff2ea9b6ae13c77 (patch) | |
| tree | 72d458b2d93e7c8c41e3335e1f90c38aaa7a06d1 /pym/_emerge/depgraph.py | |
| parent | 97d78cd3f204010a1cedef481a52829931435adc (diff) | |
| download | portage-ebee561758d81d7f3376ce316ff2ea9b6ae13c77.tar.gz portage-ebee561758d81d7f3376ce316ff2ea9b6ae13c77.tar.bz2 portage-ebee561758d81d7f3376ce316ff2ea9b6ae13c77.zip | |
* Replace config._iuse_implicit_re with a callable _iuse_implicit_match
object that simply returns boolean, and update consumers.
* Make check_required_use() take a callable for the iuse parameter,
and pass in Package.use.is_valid_flag or iuse.__contains__ as
appropriate.
Diffstat (limited to 'pym/_emerge/depgraph.py')
| -rw-r--r-- | pym/_emerge/depgraph.py | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py index 01afa88c1..f4d251478 100644 --- a/pym/_emerge/depgraph.py +++ b/pym/_emerge/depgraph.py @@ -2036,7 +2036,6 @@ class depgraph(object): missing_licenses = [] have_eapi_mask = False pkgsettings = self._frozen_config.pkgsettings[root] - implicit_iuse = pkgsettings._get_implicit_iuse() root_config = self._frozen_config.roots[root] portdb = self._frozen_config.roots[root].trees["porttree"].dbapi dbs = self._dynamic_config._filtered_trees[root]["dbs"] @@ -2672,11 +2671,9 @@ class depgraph(object): eapi_has_required_use(pkg.metadata["EAPI"]): required_use = pkg.metadata["REQUIRED_USE"] use = pkg.use.enabled - iuse = self._frozen_config.settings._get_implicit_iuse() - iuse.update(pkg.iuse.all) try: required_use_is_sat = portage.dep.check_required_use( - pkg.metadata["REQUIRED_USE"], use, iuse) + pkg.metadata["REQUIRED_USE"], use, pkg.iuse.is_valid_flag) except portage.exception.InvalidDependString as e: portage.writemsg("!!! Invalid REQUIRED_USE specified by " + \ "'%s': %s\n" % (pkg.cpv, str(e)), noiselevel=-1) @@ -6058,11 +6055,9 @@ def _get_masking_status(pkg, pkgsettings, root_config): eapi_has_required_use(pkg.metadata["EAPI"]): required_use = pkg.metadata["REQUIRED_USE"] use = pkg.use.enabled - iuse = pkgsettings._get_implicit_iuse() - iuse.update(pkg.iuse.all) try: required_use_is_sat = portage.dep.check_required_use( - required_use, use, iuse) + required_use, use, pkg.iuse.is_valid_flag) except portage.exception.InvalidDependString: mreasons.append("invalid: REQUIRED_USE") else: |