From d15e3dded958eebdb52c7370e28a62002b70dfe3 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Fri, 22 Jun 2012 22:59:51 -0700 Subject: slot_abi_mask_built: don't discard other masks --- pym/_emerge/resolver/backtracking.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pym/_emerge/resolver/backtracking.py b/pym/_emerge/resolver/backtracking.py index 09df9c822..f39bad413 100644 --- a/pym/_emerge/resolver/backtracking.py +++ b/pym/_emerge/resolver/backtracking.py @@ -187,7 +187,9 @@ class Backtracker(object): for pkg, (new_use, new_changes) in data: para.needed_use_config_changes[pkg] = (new_use, new_changes) elif change == "slot_abi_mask_built": - para.runtime_pkg_mask.update(data) + for pkg, mask_reasons in data.items(): + para.runtime_pkg_mask.setdefault(pkg, + {}).update(mask_reasons) elif change == "slot_abi_replace_installed": para.slot_abi_replace_installed.update(data) elif change == "rebuild_list": -- cgit v1.2.3-1-g7c22