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 70F0C158094 for ; Sun, 25 Sep 2022 01:36:20 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9C535E0930; Sun, 25 Sep 2022 01:36:19 +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 83BE9E0930 for ; Sun, 25 Sep 2022 01:36:19 +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 B522F3408A2 for ; Sun, 25 Sep 2022 01:36:18 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 37FB45E3 for ; Sun, 25 Sep 2022 01:36:17 +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: <1664069771.7dc66f4f5635ce4abb97b3c6698cda3396cce820.sam@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: lib/_emerge/ X-VCS-Repository: proj/portage X-VCS-Files: lib/_emerge/Scheduler.py X-VCS-Directories: lib/_emerge/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 7dc66f4f5635ce4abb97b3c6698cda3396cce820 X-VCS-Branch: master Date: Sun, 25 Sep 2022 01:36:17 +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: aaaa563c-6c1b-486f-8339-a3c8d855b6d4 X-Archives-Hash: 993c12facfb965187747f1ed5a3cb4fd commit: 7dc66f4f5635ce4abb97b3c6698cda3396cce820 Author: Sheng Yu protonmail com> AuthorDate: Fri Sep 23 20:32:01 2022 +0000 Commit: Sam James gentoo org> CommitDate: Sun Sep 25 01:36:11 2022 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=7dc66f4f _emerge: Scheduler: Use pkg_allocated_path in Scheduler We previously forgot to plumb in allocated_pkg_path to use pkg_allocated_path which meant that Scheduler allocated a new one rather than the existing one. Bug: https://bugs.gentoo.org/872392 Signed-off-by: Sheng Yu protonmail.com> Closes: https://github.com/gentoo/portage/pull/906 Signed-off-by: Sam James gentoo.org> lib/_emerge/Scheduler.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/lib/_emerge/Scheduler.py b/lib/_emerge/Scheduler.py index 9e210f182..356d6ce1f 100644 --- a/lib/_emerge/Scheduler.py +++ b/lib/_emerge/Scheduler.py @@ -975,7 +975,11 @@ class Scheduler(PollScheduler): continue if fetched: - bintree.inject(x.cpv, current_pkg_path=fetched) + bintree.inject( + x.cpv, + current_pkg_path=fetched, + allocated_pkg_path=fetcher.pkg_allocated_path, + ) infloc = os.path.join(build_dir_path, "build-info") ensure_dirs(infloc)