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

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

diff --git a/bin/emerge b/bin/emerge
index cae410dfb142c7a1fd4051b8c41b0a0b48150a06..7358c8ec2f911706d6471957ca1e6065eb0444d4 100755 (executable)
--- 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."""