Gentoo Archives: gentoo-commits

From: Zac Medico <zmedico@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/portage:master commit in: pym/_emerge/resolver/
Date: Sat, 23 Jun 2012 06:00:16
Message-Id: 1340431191.d15e3dded958eebdb52c7370e28a62002b70dfe3.zmedico@gentoo
commit:     d15e3dded958eebdb52c7370e28a62002b70dfe3
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 23 05:59:51 2012 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Sat Jun 23 05:59:51 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=d15e3dde

slot_abi_mask_built: don't discard other masks

---
 pym/_emerge/resolver/backtracking.py |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/pym/_emerge/resolver/backtracking.py b/pym/_emerge/resolver/backtracking.py
index 09df9c8..f39bad4 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":