diff options
| -rw-r--r-- | pym/portage/dep/__init__.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/pym/portage/dep/__init__.py b/pym/portage/dep/__init__.py index f8a2bc60e..ad68815a5 100644 --- a/pym/portage/dep/__init__.py +++ b/pym/portage/dep/__init__.py @@ -633,7 +633,7 @@ def flatten(mylist): _usedep_re = { "0": re.compile("^(?P<prefix>[!-]?)(?P<flag>[A-Za-z0-9][A-Za-z0-9+_@-]*)(?P<default>(\(\+\)|\(\-\))?)(?P<suffix>[?=]?)$"), -# "4": re.compile("^(?P<prefix>[!-]?)(?P<flag>[A-Za-z0-9][A-Za-z0-9+_@.-]*)(?P<default>(\(\+\)|\(\-\))?)(?P<suffix>[?=]?)$"), +# "5": re.compile("^(?P<prefix>[!-]?)(?P<flag>[A-Za-z0-9][A-Za-z0-9+_@.-]*)(?P<default>(\(\+\)|\(\-\))?)(?P<suffix>[?=]?)$"), } def _get_usedep_re(eapi): @@ -645,10 +645,10 @@ def _get_usedep_re(eapi): given eapi. If eapi is None then the latest supported EAPI is assumed. """ return _usedep_re["0"] -# if eapi in ("0", "1", "2_pre1", "2_pre2", "2_pre3", "2", "3_pre1", "3_pre2", "3", "4_pre1"): +# if eapi in ("0", "1", "2", "3_pre1", "3_pre2", "3", "4_pre1", "4"): # return _usedep_re["0"] # else: -# return _usedep_re["4"] +# return _usedep_re["5"] class _use_dep(object): @@ -1615,15 +1615,15 @@ _atom_wildcard_re = re.compile('(?P<simple>(' + _extended_cat + ')/(' + _extende _useflag_re = { "0": re.compile(r'^[A-Za-z0-9][A-Za-z0-9+_@-]*$'), -# "4": re.compile(r'^[A-Za-z0-9][A-Za-z0-9+_@.-]*$'), +# "5": re.compile(r'^[A-Za-z0-9][A-Za-z0-9+_@.-]*$'), } def _get_useflag_re(eapi): return _useflag_re["0"] -# if eapi in ("0", "1", "2_pre1", "2_pre2", "2_pre3", "2", "3_pre1", "3_pre2", "3", "4_pre1"): +# if eapi in ("0", "1", "2", "3_pre1", "3_pre2", "3", "4_pre1", "4"): # return _useflag_re["0"] # else: -# return _useflag_re["4"] +# return _useflag_re["5"] def isvalidatom(atom, allow_blockers=False, allow_wildcard=False, allow_repo=False): """ |