diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2013-05-24 11:02:22 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2013-05-24 11:02:22 -0700 |
| commit | 4839cd921b91e33b0e183d877fd9bd856250eb2a (patch) | |
| tree | 28f7683425e375076ba45ef81a3d715e3d1cb206 | |
| parent | repoman: check for deprecated EAPIs, bug #470670 (diff) | |
| download | portage-4839cd921b91e33b0e183d877fd9bd856250eb2a.tar.gz portage-4839cd921b91e33b0e183d877fd9bd856250eb2a.tar.bz2 portage-4839cd921b91e33b0e183d877fd9bd856250eb2a.zip | |
Atom: handle invalid */foo-version wildcard
Before, a wildcard atom could be treated as valid even though it
specified a version without an operator, as reported at here:
https://forums.gentoo.org/viewtopic-p-7314746.html#7314746
| -rw-r--r-- | pym/portage/dep/__init__.py | 6 | ||||
| -rw-r--r-- | pym/portage/tests/dep/test_isvalidatom.py | 5 |
2 files changed, 8 insertions, 3 deletions
diff --git a/pym/portage/dep/__init__.py b/pym/portage/dep/__init__.py index 6f3b35739..7776f8958 100644 --- a/pym/portage/dep/__init__.py +++ b/pym/portage/dep/__init__.py @@ -29,7 +29,7 @@ from portage.eapi import _get_eapi_attrs from portage.exception import InvalidAtom, InvalidData, InvalidDependString from portage.localization import _ from portage.versions import catpkgsplit, catsplit, \ - vercmp, ververify, _cp, _cpv, _pkg_str, _slot, _unknown_repo + vercmp, ververify, _cp, _cpv, _pkg_str, _slot, _unknown_repo, _vr import portage.cache.mappings if sys.hexversion >= 0x3000000: @@ -121,7 +121,7 @@ def _get_atom_wildcard_re(eapi_attrs): pkg_re = r'[\w+*][\w+*-]*?' atom_re = re.compile(r'((?P<simple>(' + - _extended_cat + r')/(' + pkg_re + r'))' + \ + _extended_cat + r')/(' + pkg_re + r'(-' + _vr + ')?))' + \ '|(?P<star>=((' + _extended_cat + r')/(' + pkg_re + r'))-(?P<version>\*\w+\*)))' + \ '(:(?P<slot>' + _slot_loose + r'))?(' + _repo_separator + r'(?P<repo>' + _repo_name + r'))?$', re.UNICODE) @@ -1243,6 +1243,8 @@ class Atom(_unicode): else: op = None cpv = cp = m.group('simple') + if m.group(atom_re.groupindex['simple'] + 3) is not None: + raise InvalidAtom(self) if cpv.find("**") != -1: raise InvalidAtom(self) slot = m.group('slot') diff --git a/pym/portage/tests/dep/test_isvalidatom.py b/pym/portage/tests/dep/test_isvalidatom.py index 6b0566da6..67ba60398 100644 --- a/pym/portage/tests/dep/test_isvalidatom.py +++ b/pym/portage/tests/dep/test_isvalidatom.py @@ -1,4 +1,4 @@ -# Copyright 2006-2010 Gentoo Foundation +# Copyright 2006-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 from portage.tests import TestCase @@ -143,6 +143,9 @@ class IsValidAtom(TestCase): IsValidAtomTestCase("virtual/ffmpeg:*", True), IsValidAtomTestCase("virtual/ffmpeg:0*", False), IsValidAtomTestCase("virtual/ffmpeg:0", True), + + # Wildcard atoms + IsValidAtomTestCase("*/portage-2.1", False, allow_wildcard=True), ) for test_case in test_cases: |