projects
/
portage.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
e5bfb31
)
expand_new_virtuals: fix last commit USE handling
author
Zac Medico
<zmedico@gentoo.org>
Mon, 7 Feb 2011 22:19:33 +0000
(14:19 -0800)
committer
Zac Medico
<zmedico@gentoo.org>
Tue, 8 Feb 2011 00:53:30 +0000
(16:53 -0800)
pym/portage/dep/dep_check.py
patch
|
blob
|
history
diff --git
a/pym/portage/dep/dep_check.py
b/pym/portage/dep/dep_check.py
index 60896c06e66abc745e1254aba078fc2777454516..9373ecbbca43bb8313863023b99b22a1b1baff38 100644
(file)
--- a/
pym/portage/dep/dep_check.py
+++ b/
pym/portage/dep/dep_check.py
@@
-124,8
+124,11
@@
def _expand_new_virtuals(mysplit, edebug, mydbapi, mysettings, myroot="/",
if x.unevaluated_atom.use:
virt_atom += str(x.unevaluated_atom.use)
virt_atom = Atom(virt_atom)
- virt_atom = virt_atom.evaluate_conditionals(
- pkg_use_enabled(graph_parent))
+ if graph_parent is None:
+ virt_atom = virt_atom.evaluate_conditionals(myuse)
+ else:
+ virt_atom = virt_atom.evaluate_conditionals(
+ pkg_use_enabled(graph_parent))
else:
virt_atom = Atom(virt_atom)
# According to GLEP 37, RDEPEND is the only dependency