From: Zac Medico <zmedico@gentoo.org>
Date: Mon, 7 Feb 2011 11:11:08 +0000 (-0800)
Subject: expand_new_virtuals: save atom unevaluated use
X-Git-Tag: v2.2.0_alpha22~6
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=a60acb9f203f56af8225dc7dda7c453a12fd6372;p=portage.git

expand_new_virtuals: save atom unevaluated use

This leads to a better unsatisfied USE message than the one reported
in bug 353933, comment #3. TODO: Fix it so that these generated
atoms don't break depgraph._get_dep_chain(), due to not being
identical to the original atoms and therefore breaking
extract_affecting_use().
---

diff --git a/pym/portage/dep/dep_check.py b/pym/portage/dep/dep_check.py
index cd740cda3..3381af9ca 100644
--- a/pym/portage/dep/dep_check.py
+++ b/pym/portage/dep/dep_check.py
@@ -121,8 +121,8 @@ def _expand_new_virtuals(mysplit, edebug, mydbapi, mysettings, myroot="/",
 		a = []
 		for pkg in pkgs:
 			virt_atom = '=' + pkg.cpv
-			if x.use:
-				virt_atom += str(x.use)
+			if x.unevaluated_atom.use:
+				virt_atom += str(x.unevaluated_atom.use)
 			virt_atom = Atom(virt_atom)
 			# According to GLEP 37, RDEPEND is the only dependency
 			# type that is valid for new-style virtuals. Repoman