From: Zac Medico <zmedico@gentoo.org>
Date: Tue, 8 Feb 2011 00:42:37 +0000 (-0800)
Subject: expand_new_virtuals: handle None for myuse
X-Git-Tag: v2.2.0_alpha22
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=15389929b684b41801ffc880c4a4e6714e4245b6;p=portage.git

expand_new_virtuals: handle None for myuse
---

diff --git a/pym/portage/dep/dep_check.py b/pym/portage/dep/dep_check.py
index 9373ecbbc..ca656019d 100644
--- a/pym/portage/dep/dep_check.py
+++ b/pym/portage/dep/dep_check.py
@@ -125,7 +125,11 @@ def _expand_new_virtuals(mysplit, edebug, mydbapi, mysettings, myroot="/",
 				virt_atom += str(x.unevaluated_atom.use)
 				virt_atom = Atom(virt_atom)
 				if graph_parent is None:
-					virt_atom = virt_atom.evaluate_conditionals(myuse)
+					if myuse is None:
+						virt_atom = virt_atom.evaluate_conditionals(
+							mysettings.get("PORTAGE_USE", "").split())
+					else:
+						virt_atom = virt_atom.evaluate_conditionals(myuse)
 				else:
 					virt_atom = virt_atom.evaluate_conditionals(
 						pkg_use_enabled(graph_parent))