From: Zac Medico <zmedico@gentoo.org>
Date: Thu, 21 Sep 2006 00:58:49 +0000 (-0000)
Subject: Fix depgraph.validate_blockers() logic so that match_from_list works correctly.
X-Git-Tag: v2.1.1-r1~48
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=6c711c380e203c74b35477a81ac8c13421aa8c67;p=portage.git

Fix depgraph.validate_blockers() logic so that match_from_list works correctly.

svn path=/main/trunk/; revision=4487
---

diff --git a/bin/emerge b/bin/emerge
index ce449c720..5cf60720b 100755
--- a/bin/emerge
+++ b/bin/emerge
@@ -1241,9 +1241,12 @@ class depgraph:
 		for blocker in all_blockers:
 			mytype, myroot, mydep = blocker.split()
 			mykey = portage.dep_getkey(mydep)
-			if mykey not in self.pkg_slots[myroot] or \
-					not portage.match_from_list(mydep, \
-					self.pkg_slots[myroot][mykey].values()):
+			valid = False
+			pkgs = self.pkg_slots[myroot].get(mykey, None)
+			if pkgs and portage.match_from_list(mydep,
+				[pkgs[myslot] for myslot in pkgs]):
+				valid = True
+			if not valid:
 				self.digraph.remove(blocker)
 
 	def altlist(self, reversed=False):