commit:     7dc66f4f5635ce4abb97b3c6698cda3396cce820
Author:     Sheng Yu <syu.os <AT> protonmail <DOT> com>
AuthorDate: Fri Sep 23 20:32:01 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> 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 <syu.os <AT> protonmail.com>
Closes: https://github.com/gentoo/portage/pull/906
Signed-off-by: Sam James <sam <AT> 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)

Reply via email to