From 9f952450551ade43935456154f07ef79a1f859bb Mon Sep 17 00:00:00 2001
From: Zac Medico <zmedico@gentoo.org>
Date: Tue, 20 Nov 2007 22:18:23 +0000
Subject: Fix blocker handling to properly handle SLOT atoms in
 depgraph.validate_blockers(). (trunk r8495)

svn path=/main/branches/2.1.2/; revision=8555
---
 bin/emerge | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'bin/emerge')

diff --git a/bin/emerge b/bin/emerge
index 70bb6403e..611b4abfd 100755
--- 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 = \
-- 
cgit v1.2.3-1-g7c22