summaryrefslogtreecommitdiffstats
path: root/pym/portage/dep/dep_check.py
diff options
context:
space:
mode:
authorSebastian Luther <SebastianLuther@gmx.de>2010-08-11 10:11:58 +0200
committerZac Medico <zmedico@gentoo.org>2010-08-11 01:19:35 -0700
commitca288e594b1160157c9743250422973d30587f0a (patch)
treec45c3fbceb7fa6a77b91151abcdc2862cf44f5eb /pym/portage/dep/dep_check.py
parentddd207ef7fd6b57f464bd9f2d8890eb7dbd9f0d4 (diff)
downloadportage-ca288e594b1160157c9743250422973d30587f0a.tar.gz
portage-ca288e594b1160157c9743250422973d30587f0a.tar.bz2
portage-ca288e594b1160157c9743250422973d30587f0a.zip
Introduce portage.eapi. Use it everywhere.
Diffstat (limited to 'pym/portage/dep/dep_check.py')
-rw-r--r--pym/portage/dep/dep_check.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/pym/portage/dep/dep_check.py b/pym/portage/dep/dep_check.py
index 6ca96967f..691e1b50b 100644
--- a/pym/portage/dep/dep_check.py
+++ b/pym/portage/dep/dep_check.py
@@ -8,6 +8,7 @@ import logging
import portage
from portage.dep import Atom, dep_opconvert, match_from_list, \
remove_slot, use_reduce
+from portage.eapi import eapi_has_strong_blocks, eapi_has_use_deps
from portage.exception import InvalidAtom, InvalidDependString, ParseError
from portage.localization import _
from portage.util import writemsg, writemsg_level
@@ -65,10 +66,10 @@ def _expand_new_virtuals(mysplit, edebug, mydbapi, mysettings, myroot="/",
_("invalid atom: '%s'") % x)
else:
if x.blocker and x.blocker.overlap.forbid and \
- eapi in ("0", "1"):
+ not eapi_has_strong_blocks(eapi):
raise ParseError(
_("invalid atom: '%s'") % (x,))
- if x.use and eapi in ("0", "1"):
+ if x.use and not eapi_has_use_deps(eapi):
raise ParseError(
_("invalid atom: '%s'") % (x,))