Fix blocker handling to properly handle SLOT atoms in

depgraph.validate_blockers(). (trunk r8495)

svn path=/main/branches/2.1.2/; revision=8555

diff --git a/bin/emerge b/bin/emerge
index 70bb6403ea40c52b3ad011eafe9dd9d995f8b99b..611b4abfdf4199945be82f977e7a2509a0014f5b 100755 (executable)
--- a/bin/emerge
+++ b/bin/emerge
@@ -2270,7 +2270,9 @@ class depgraph:
                                                slot_atom in modified_slots[myroot]:
                                                replacement = final_db.match(slot_atom)
                                                if replacement:
-                                                       if not portage.match_from_list(mydep, replacement):
+                                                       slot = portage_dep.dep_getslot(slot_atom)
+                                                       if not portage.match_from_list(
+                                                               mydep, ["%s:%s" % (replacement[0], slot)]):
                                                                # Apparently a replacement may be able to
                                                                # invalidate this block.
                                                                replacement_node = \