diff options
| author | Zac Medico <zmedico@gentoo.org> | 2012-06-22 23:28:10 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2012-06-22 23:28:10 -0700 |
| commit | 22b8c653bbb09570b428f7f744a267feb30bf4f1 (patch) | |
| tree | 7bea1b10fbc34043606bd4351c1e2aea02f7e3d5 /pym/_emerge/resolver | |
| parent | d15e3dded958eebdb52c7370e28a62002b70dfe3 (diff) | |
| download | portage-22b8c653bbb09570b428f7f744a267feb30bf4f1.tar.gz portage-22b8c653bbb09570b428f7f744a267feb30bf4f1.tar.bz2 portage-22b8c653bbb09570b428f7f744a267feb30bf4f1.zip | |
Slot conflict "abi" backtrack nodes non-terminal.
Diffstat (limited to 'pym/_emerge/resolver')
| -rw-r--r-- | pym/_emerge/resolver/backtracking.py | 2 |
1 files changed, 2 insertions, 0 deletions
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, |