[gentoo-commits] proj/portage:master commit in: lib/portage/dep/

[Zac Medico]

commit:     b59e2545a88dccf70e546d49e08a5a99110dd628
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 28 01:04:07 2020 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Sat Nov 28 03:13:02 2020 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=b59e2545

backtracking: fix virtual choices for circular deps (bug 757306)

Fix virtual choices to be consistent with circular dependency
backtracking choices.

Fixes: f78a91e44e3e ("backtracking: adjust || preference to break dependency 
cycles")
Bug: https://bugs.gentoo.org/757306
Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>

 lib/portage/dep/dep_check.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/lib/portage/dep/dep_check.py b/lib/portage/dep/dep_check.py
index 60c8ec6d0..b89d5d651 100644
--- a/lib/portage/dep/dep_check.py
+++ b/lib/portage/dep/dep_check.py
@@ -356,6 +356,7 @@ def dep_zapdeps(unreduced, reduced, myroot, use_binaries=0, 
trees=None,
 
        # Alias the trees we'll be checking availability against
        parent   = trees[myroot].get("parent")
+       virt_parent = trees[myroot].get("virt_parent")
        priority = trees[myroot].get("priority")
        graph_db = trees[myroot].get("graph_db")
        graph    = trees[myroot].get("graph")
@@ -596,8 +597,10 @@ def dep_zapdeps(unreduced, reduced, myroot, 
use_binaries=0, trees=None,
                                                        if 
match_from_list(atom, cpv_slot_list):
                                                                circular_atom = 
atom
                                                                break
-                                               else:
-                                                       for circular_child in 
circular_dependency.get(parent, []):
+                               if circular_atom is None and 
circular_dependency is not None:
+                                       for circular_child in itertools.chain(
+                                                               
circular_dependency.get(parent, []),
+                                                               
circular_dependency.get(virt_parent, [])):
                                                                for atom in 
atoms:
                                                                        if not 
atom.blocker and atom.match(circular_child):
                                                                                
circular_atom = atom