From: Zac Medico <zmedico@gentoo.org>
Date: Wed, 27 Apr 2011 16:13:51 +0000 (-0700)
Subject: expand_new_virt: don't traverse blockers
X-Git-Tag: v2.1.9.47~28
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=a76dd07a2569eb515855ecc6ce3487d39ff8005d;p=portage.git

expand_new_virt: don't traverse blockers
---

diff --git a/pym/_emerge/actions.py b/pym/_emerge/actions.py
index 68b828256..1c6829816 100644
--- a/pym/_emerge/actions.py
+++ b/pym/_emerge/actions.py
@@ -1295,11 +1295,17 @@ def expand_new_virt(vardb, atom):
 	or it does not match an installed package then it is
 	yielded without any expansion.
 	"""
+	if not isinstance(atom, Atom):
+		atom = Atom(atom)
 	traversed = set()
 	stack = [atom]
 
 	while stack:
 		atom = stack.pop()
+		if atom.blocker:
+			yield atom
+			continue
+
 		matches = vardb.match(atom)
 		if not (matches and matches[-1].startswith("virtual/")):
 			yield atom