From: Zac Medico <zmedico@gentoo.org>
Date: Tue, 7 Nov 2006 02:55:40 +0000 (-0000)
Subject: Fix validate_blockers() so that a package doesn't block itself via a virtual that... 
X-Git-Tag: v2.1.2~496
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=710a804066038579a153128d4d877911af061acb;p=portage.git

Fix validate_blockers() so that a package doesn't block itself via a virtual that it provides.

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

diff --git a/bin/emerge b/bin/emerge
index cae410dfb..7358c8ec2 100755
--- a/bin/emerge
+++ b/bin/emerge
@@ -1449,7 +1449,7 @@ class depgraph:
 			blocked_after_update = self.mydbapi[myroot].match(mydep)
 			if not blocked_pkgs and not blocked_after_update:
 				del self.blocker_parents[blocker]
-			elif not blocked_after_update:
+			else:
 				"""It may be possible to circumvent this block via correct
 				ordering of upgrades.  If necessary, create hard deps to
 				enforce correct merge order."""