projects
/
portage.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
4abea4a
)
expand_new_virt: don't traverse blockers
author
Zac Medico
<zmedico@gentoo.org>
Wed, 27 Apr 2011 16:13:51 +0000
(09:13 -0700)
committer
Zac Medico
<zmedico@gentoo.org>
Wed, 4 May 2011 19:27:40 +0000
(12:27 -0700)
pym/_emerge/actions.py
patch
|
blob
|
history
diff --git
a/pym/_emerge/actions.py
b/pym/_emerge/actions.py
index 68b82825608133f77a1714fc0df5e31b89520f58..1c68298165713d0792bf67cdd2a28b345bf97653 100644
(file)
--- 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