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 6F67915800F for ; Thu, 19 Jan 2023 20:57:43 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9CB5AE08AD; Thu, 19 Jan 2023 20:57:42 +0000 (UTC) Received: from smtp.gentoo.org (dev.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)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 8345DE08AD for ; Thu, 19 Jan 2023 20:57:42 +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)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 92BC3340B28 for ; Thu, 19 Jan 2023 20:57:40 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 090167DE for ; Thu, 19 Jan 2023 20:57:39 +0000 (UTC) From: "Arthur Zamarin" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Arthur Zamarin" Message-ID: <1674161668.0e22d6f56b735b5b7449e5e3f800685bb54651d4.arthurzam@gentoo> Subject: [gentoo-commits] proj/pkgcore/pkgcheck:master commit in: src/pkgcheck/addons/ X-VCS-Repository: proj/pkgcore/pkgcheck X-VCS-Files: src/pkgcheck/addons/profiles.py X-VCS-Directories: src/pkgcheck/addons/ X-VCS-Committer: arthurzam X-VCS-Committer-Name: Arthur Zamarin X-VCS-Revision: 0e22d6f56b735b5b7449e5e3f800685bb54651d4 X-VCS-Branch: master Date: Thu, 19 Jan 2023 20:57:39 +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: 9c6387d0-5403-4a0e-a2ef-6d05ef730097 X-Archives-Hash: 254fd375805650598fe5955e51117fc8 commit: 0e22d6f56b735b5b7449e5e3f800685bb54651d4 Author: Daniel M. Weeks danweeks net> AuthorDate: Thu Jan 19 17:12:06 2023 +0000 Commit: Arthur Zamarin gentoo org> CommitDate: Thu Jan 19 20:54:28 2023 +0000 URL: https://gitweb.gentoo.org/proj/pkgcore/pkgcheck.git/commit/?id=0e22d6f5 Use REPO profile base for profile caching Prior to this change, scanning an overlay would always cause a profile cache update since nothing repo-specific was actually getting updated. Signed-off-by: Daniel M. Weeks danweeks.net> Closes: https://github.com/pkgcore/pkgcheck/pull/528 Signed-off-by: Arthur Zamarin gentoo.org> src/pkgcheck/addons/profiles.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/pkgcheck/addons/profiles.py b/src/pkgcheck/addons/profiles.py index 799cd94a..f9a6862e 100644 --- a/src/pkgcheck/addons/profiles.py +++ b/src/pkgcheck/addons/profiles.py @@ -267,7 +267,9 @@ class ProfileAddon(caches.CachedAddon): for profile_obj, profile in self.arch_profiles.get(arch, []): files = self.profile_data.get(profile) try: - cached_profile = cached_profiles[profile.base][profile.path] + cached_profile = cached_profiles[repo.config.profiles_base][ + profile.path + ] if files != cached_profile["files"]: # force refresh of outdated cache entry raise KeyError @@ -329,8 +331,8 @@ class ProfileAddon(caches.CachedAddon): # unsupported EAPI or other issue, profile checks will catch this continue - cached_profiles[profile.base]["update"] = True - cached_profiles[profile.base][profile.path] = { + cached_profiles[repo.config.profiles_base]["update"] = True + cached_profiles[repo.config.profiles_base][profile.path] = { "files": files, "masks": masks, "unmasks": unmasks,