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/portage/dbapi/__init__.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/portage/dbapi/__init__.py')
| -rw-r--r-- | pym/portage/dbapi/__init__.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pym/portage/dbapi/__init__.py b/pym/portage/dbapi/__init__.py index 99fb55723..3803339d5 100644 --- a/pym/portage/dbapi/__init__.py +++ b/pym/portage/dbapi/__init__.py @@ -145,7 +145,7 @@ class dbapi(object): 2) Check enabled/disabled flag states. """ - iuse_implicit_re = self.settings._iuse_implicit_re + iuse_implicit_match = self.settings._iuse_implicit_match for cpv in cpv_iter: try: iuse, slot, use = self.aux_get(cpv, ["IUSE", "SLOT", "USE"]) @@ -156,7 +156,7 @@ class dbapi(object): missing_iuse = False for x in atom.use.required: if x not in iuse and x not in atom.use.missing_enabled \ - and x not in atom.use.missing_disabled and iuse_implicit_re.match(x) is None: + and x not in atom.use.missing_disabled and not iuse_implicit_match(x): missing_iuse = True break if missing_iuse: |