commit: 2f020ae6aca04a0db68b7ceb5413e2b815d2169d Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Wed Dec 21 01:30:22 2022 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Wed Dec 21 01:30:55 2022 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=2f020ae6
Revert "porttree: skip metadata verification if repository is immutable (not volatile)" This reverts commit f05140beb2dd9a3577ff2042941cb3e4fbb1df31. I didn't mean to push this one yet, which we're going to handle separately. Bug: https://bugs.gentoo.org/528394 Signed-off-by: Sam James <sam <AT> gentoo.org> lib/portage/dbapi/porttree.py | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/lib/portage/dbapi/porttree.py b/lib/portage/dbapi/porttree.py index 448a7f300..15e1fd6ff 100644 --- a/lib/portage/dbapi/porttree.py +++ b/lib/portage/dbapi/porttree.py @@ -614,8 +614,7 @@ class portdbapi(dbapi): if ro_auxdb is not None: auxdbs.append(ro_auxdb) auxdbs.append(self.auxdb[repo_path]) - repo = self.repositories.get_repo_for_location(repo_path) - eclass_db = repo.eclass_db + eclass_db = self.repositories.get_repo_for_location(repo_path).eclass_db for auxdb in auxdbs: try: @@ -638,9 +637,7 @@ class portdbapi(dbapi): # EAPI from _parse_eapi_ebuild_head, we disregard cache entries # for unsupported EAPIs. continue - if not repo.volatile or auxdb.validate_entry( - metadata, ebuild_hash, eclass_db - ): + if auxdb.validate_entry(metadata, ebuild_hash, eclass_db): break else: metadata = None
