summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2012-06-22 22:59:51 -0700
committerZac Medico <zmedico@gentoo.org>2012-06-22 22:59:51 -0700
commitd15e3dded958eebdb52c7370e28a62002b70dfe3 (patch)
tree9f12261f8beec573f195a40d1b834320f41c6781
parent5497c9f1443f1f615f145ee645f17959ed20168c (diff)
downloadportage-d15e3dded958eebdb52c7370e28a62002b70dfe3.tar.gz
portage-d15e3dded958eebdb52c7370e28a62002b70dfe3.tar.bz2
portage-d15e3dded958eebdb52c7370e28a62002b70dfe3.zip
slot_abi_mask_built: don't discard other masks
-rw-r--r--pym/_emerge/resolver/backtracking.py4
1 files changed, 3 insertions, 1 deletions
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":