From: Zac Medico <zmedico@gentoo.org>
Date: Sun, 10 Jul 2011 03:24:49 +0000 (-0700)
Subject: depgraph: reject USE conditionals in arguments
X-Git-Tag: v2.2.0_alpha44~31
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=895823111601bb73204daf5cdaf86d401d91983c;p=portage.git

depgraph: reject USE conditionals in arguments
---

diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py
index 64ed50e27..2a5848ce7 100644
--- a/pym/_emerge/depgraph.py
+++ b/pym/_emerge/depgraph.py
@@ -2082,6 +2082,14 @@ class depgraph(object):
 					else:
 						atom = null_atom
 
+				if atom.use and atom.use.conditional:
+					writemsg(
+						("\n\n!!! '%s' contains a conditional " + \
+						"which is not allowed.\n") % (x,), noiselevel=-1)
+					writemsg("!!! Please check ebuild(5) for full details.\n")
+					self._dynamic_config._skip_restart = True
+					return (0,[])
+
 				args.append(AtomArg(arg=x, atom=atom,
 					root_config=root_config))