From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 01143158020 for ; Wed, 21 Dec 2022 01:31:02 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4D527E0965; Wed, 21 Dec 2022 01:31:01 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 30A01E0965 for ; Wed, 21 Dec 2022 01:31:01 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 59178341692 for ; Wed, 21 Dec 2022 01:31:00 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B81E5771 for ; Wed, 21 Dec 2022 01:30:58 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1671586255.2f020ae6aca04a0db68b7ceb5413e2b815d2169d.sam@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: lib/portage/dbapi/ X-VCS-Repository: proj/portage X-VCS-Files: lib/portage/dbapi/porttree.py X-VCS-Directories: lib/portage/dbapi/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 2f020ae6aca04a0db68b7ceb5413e2b815d2169d X-VCS-Branch: master Date: Wed, 21 Dec 2022 01:30:58 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 2c406a68-9a3a-41e2-9e01-8abbe4373e7c X-Archives-Hash: 361ef219aac742672c1eee92a988a38a commit: 2f020ae6aca04a0db68b7ceb5413e2b815d2169d Author: Sam James gentoo org> AuthorDate: Wed Dec 21 01:30:22 2022 +0000 Commit: Sam James gentoo 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 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