From 22b8c653bbb09570b428f7f744a267feb30bf4f1 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Fri, 22 Jun 2012 23:28:10 -0700 Subject: Slot conflict "abi" backtrack nodes non-terminal. --- pym/_emerge/resolver/backtracking.py | 2 ++ 1 file changed, 2 insertions(+) (limited to 'pym/_emerge/resolver/backtracking.py') diff --git a/pym/_emerge/resolver/backtracking.py b/pym/_emerge/resolver/backtracking.py index f39bad413..00a07bcb6 100644 --- a/pym/_emerge/resolver/backtracking.py +++ b/pym/_emerge/resolver/backtracking.py @@ -186,6 +186,8 @@ class Backtracker(object): elif change == "needed_use_config_changes": for pkg, (new_use, new_changes) in data: para.needed_use_config_changes[pkg] = (new_use, new_changes) + elif change == "slot_conflict_abi": + new_node.terminal = False elif change == "slot_abi_mask_built": for pkg, mask_reasons in data.items(): para.runtime_pkg_mask.setdefault(pkg, -- cgit v1.2.3-1-g7c22