From 1a7fc63d20ad2e1292be3697c105c2d7e1691f91 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Fri, 31 May 2024 21:56:45 -0700 Subject: MergeProcess: Pass bintree to subprocess It's required for FEATURES=*-backup. Fixes: b9a85ff987ea ("MergeProcess: Support QueryCommand with spawn start method") Bug: https://bugs.gentoo.org/933297 Signed-off-by: Zac Medico --- lib/portage/dbapi/_MergeProcess.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/portage/dbapi/_MergeProcess.py b/lib/portage/dbapi/_MergeProcess.py index d9ab2b47a..34e39eb22 100644 --- a/lib/portage/dbapi/_MergeProcess.py +++ b/lib/portage/dbapi/_MergeProcess.py @@ -1,4 +1,4 @@ -# Copyright 2010-2023 Gentoo Authors +# Copyright 2010-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 import functools @@ -183,11 +183,12 @@ class MergeProcess(ForkProcess): # Since the entire QueryCommand._db is not required, only pass # in tree types that QueryCommand specifically requires. + # NOTE: For FEATURES=*-backup bintree is needed (bug 933297). child_db = {} parent_db = portage.db if QueryCommand._db is None else QueryCommand._db for root in parent_db: child_db[root] = {} - for tree_type in ("vartree", "porttree"): + for tree_type in ("bintree", "porttree", "vartree"): child_db[root][tree_type] = parent_db[root][tree_type] self.target = functools.partial( -- cgit v1.2.3-65-gdbad