summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2011-06-09 11:48:19 -0700
committerZac Medico <zmedico@gentoo.org>2011-06-09 11:48:19 -0700
commitd85506e8a37778e0935f43f9e7cc62bb8b933063 (patch)
treea7dc47880cac73c993a5766fdc60f50b15c71319
parent501eef33b5ac990ae4b164a27e635be34cb9d14d (diff)
downloadportage-d85506e8a37778e0935f43f9e7cc62bb8b933063.tar.gz
portage-d85506e8a37778e0935f43f9e7cc62bb8b933063.tar.bz2
portage-d85506e8a37778e0935f43f9e7cc62bb8b933063.zip
useflag/dep_re: less strict if eapi None
When eapi is None then validation is not as strict, since we want the same to work for multiple EAPIs that may have slightly different rules.
-rw-r--r--pym/portage/dep/__init__.py19
-rw-r--r--pym/portage/tests/dep/test_use_reduce.py2
2 files changed, 16 insertions, 5 deletions
diff --git a/pym/portage/dep/__init__.py b/pym/portage/dep/__init__.py
index ba373241f..b9020a7a7 100644
--- a/pym/portage/dep/__init__.py
+++ b/pym/portage/dep/__init__.py
@@ -641,13 +641,15 @@ _usedep_re = {
def _get_usedep_re(eapi):
"""
+ When eapi is None then validation is not as strict, since we want the
+ same to work for multiple EAPIs that may have slightly different rules.
@param eapi: The EAPI
@type eapi: String or None
@rtype: regular expression object
- @return: A regular expression object that matches valid USE flags for the
- given eapi. If eapi is None then the latest supported EAPI is assumed.
+ @return: A regular expression object that matches valid USE deps for the
+ given eapi.
"""
- if eapi in ("4-python",):
+ if eapi in (None, "4-python",):
return _usedep_re["4-python"]
else:
return _usedep_re["0"]
@@ -1625,7 +1627,16 @@ _useflag_re = {
}
def _get_useflag_re(eapi):
- if eapi in ("4-python",):
+ """
+ When eapi is None then validation is not as strict, since we want the
+ same to work for multiple EAPIs that may have slightly different rules.
+ @param eapi: The EAPI
+ @type eapi: String or None
+ @rtype: regular expression object
+ @return: A regular expression object that matches valid USE flags for the
+ given eapi.
+ """
+ if eapi in (None, "4-python",):
return _useflag_re["4-python"]
else:
return _useflag_re["0"]
diff --git a/pym/portage/tests/dep/test_use_reduce.py b/pym/portage/tests/dep/test_use_reduce.py
index ac815632a..1618430c5 100644
--- a/pym/portage/tests/dep/test_use_reduce.py
+++ b/pym/portage/tests/dep/test_use_reduce.py
@@ -8,7 +8,7 @@ from portage.dep import Atom, use_reduce
class UseReduceTestCase(object):
def __init__(self, deparray, uselist=[], masklist=[], \
matchall=0, excludeall=[], is_src_uri=False, \
- eapi=None, opconvert=False, flat=False, expected_result=None, \
+ eapi="0", opconvert=False, flat=False, expected_result=None, \
is_valid_flag=None, token_class=None):
self.deparray = deparray
self.uselist = uselist