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 DD379158041 for ; Sat, 24 Feb 2024 20:03:10 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 06697E29C4; Sat, 24 Feb 2024 20:03:10 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (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 97219E29C4 for ; Sat, 24 Feb 2024 20:03:09 +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 A4209343069 for ; Sat, 24 Feb 2024 20:03:08 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4052F137F for ; Sat, 24 Feb 2024 20:03:07 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: <1708781969.d06515e1424be60c8ed7af6ed2a80d56145b85c5.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: lib/_emerge/ X-VCS-Repository: proj/portage X-VCS-Files: lib/_emerge/depgraph.py X-VCS-Directories: lib/_emerge/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: d06515e1424be60c8ed7af6ed2a80d56145b85c5 X-VCS-Branch: master Date: Sat, 24 Feb 2024 20:03:07 +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: b38c4f40-4e9f-4c27-b40e-d4b818d713c0 X-Archives-Hash: 10c7b428b82158a06437ff91c26cc79f commit: d06515e1424be60c8ed7af6ed2a80d56145b85c5 Author: Zac Medico gentoo org> AuthorDate: Sat Feb 24 13:28:22 2024 +0000 Commit: Zac Medico gentoo org> CommitDate: Sat Feb 24 13:39:29 2024 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=d06515e1 _dynamic_deps_preload: Fix settings reference Use the settings reference from the config pool as intended to prevent a KeyError similar to bug 924319 but triggered by emerge --dynamic-deps. Fixes: f9ea958018c0 ("MetadataRegen: Use EbuildMetadataPhase deallocate_config") Bug: https://bugs.gentoo.org/925350 Signed-off-by: Zac Medico gentoo.org> lib/_emerge/depgraph.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/_emerge/depgraph.py b/lib/_emerge/depgraph.py index ea96bd58c4..6853ec4911 100644 --- a/lib/_emerge/depgraph.py +++ b/lib/_emerge/depgraph.py @@ -783,7 +783,7 @@ class depgraph: ebuild_hash=ebuild_hash, portdb=portdb, repo_path=repo_path, - settings=portdb.doebuild_settings, + settings=settings, deallocate_config=deallocate_config, ) proc.addExitListener(self._dynamic_deps_proc_exit(pkg, fake_vartree))