commit: 7a43de7a8ce8dc6836d998cb87a5135ba8f0bc2c Author: Zac Medico <zmedico <AT> gentoo <DOT> org> AuthorDate: Tue Oct 24 18:07:53 2023 +0000 Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> CommitDate: Tue Oct 24 18:08:23 2023 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=7a43de7a
dbapi: Make _iuse_implicit_cnstr picklable for spawn compat Bug: https://bugs.gentoo.org/916235 Signed-off-by: Zac Medico <zmedico <AT> gentoo.org> lib/portage/dbapi/__init__.py | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/lib/portage/dbapi/__init__.py b/lib/portage/dbapi/__init__.py index 233da8d698..dd697db109 100644 --- a/lib/portage/dbapi/__init__.py +++ b/lib/portage/dbapi/__init__.py @@ -1,8 +1,9 @@ -# Copyright 1998-2020 Gentoo Authors +# Copyright 1998-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 __all__ = ["dbapi"] +import functools import re import warnings from typing import Any, Dict, List, Optional, Tuple @@ -223,6 +224,10 @@ class dbapi: yield cpv + @staticmethod + def _iuse_implicit_built(iuse_implicit_match, use, flag): + return iuse_implicit_match(flag) or flag in use + def _iuse_implicit_cnstr(self, pkg, metadata): """ Construct a callable that checks if a given USE flag should @@ -257,9 +262,11 @@ class dbapi: # This behavior is only used for EAPIs that support IUSE_EFFECTIVE, # since built USE settings for earlier EAPIs may contain a large # number of irrelevant flags. - prof_iuse = iuse_implicit_match - enabled = frozenset(metadata["USE"].split()).__contains__ - iuse_implicit_match = lambda flag: prof_iuse(flag) or enabled(flag) + iuse_implicit_match = functools.partial( + self._iuse_implicit_built, + iuse_implicit_match, + frozenset(metadata["USE"].split()), + ) return iuse_implicit_match
