summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2009-06-30 09:15:52 +0000
committerZac Medico <zmedico@gentoo.org>2009-06-30 09:15:52 +0000
commitd7f6174284a3d97613c2f5b8cee48fccfd22dcf8 (patch)
treeb45f5b941130f5ae00e1ef88d1911c16ed55f769
parentbfb4f6446422205198ce3a1662a9f3b21065924c (diff)
downloadportage-d7f6174284a3d97613c2f5b8cee48fccfd22dcf8.tar.gz
portage-d7f6174284a3d97613c2f5b8cee48fccfd22dcf8.tar.bz2
portage-d7f6174284a3d97613c2f5b8cee48fccfd22dcf8.zip
Bug #275901 - Make emerge bail out for USE deps in EAPI 0 and 1.
svn path=/main/trunk/; revision=13743
-rw-r--r--pym/portage/__init__.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py
index 947aea07b..a187bf568 100644
--- a/pym/portage/__init__.py
+++ b/pym/portage/__init__.py
@@ -6909,6 +6909,10 @@ def _expand_new_virtuals(mysplit, edebug, mydbapi, mysettings, myroot="/",
eapi in ("0", "1") and portage.dep._dep_check_strict:
raise portage.exception.ParseError(
"invalid atom: '%s'" % (x,))
+ if x.use and eapi in ("0", "1") and \
+ portage.dep._dep_check_strict:
+ raise portage.exception.ParseError(
+ "invalid atom: '%s'" % (x,))
if repoman and x.use and x.use.conditional:
evaluated_atom = portage.dep.remove_slot(x)