diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2009-03-11 07:45:33 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2009-03-11 07:45:33 +0000 |
| commit | 64475c22351be7730fa76091c89cf343000012b3 (patch) | |
| tree | 908cf469b5b8c96d380c316a6b01938f08202a9f | |
| parent | Remove redundant conditional inside _src_uri_validate(). (trunk r12819) (diff) | |
| download | portage-multirepo-64475c22351be7730fa76091c89cf343000012b3.tar.gz portage-multirepo-64475c22351be7730fa76091c89cf343000012b3.tar.bz2 portage-multirepo-64475c22351be7730fa76091c89cf343000012b3.zip | |
Make _src_uri_validate() identify the || operator as invalid and add a
corresponding test case. (trunk r12820)
svn path=/main/branches/2.1.6/; revision=13052
| -rw-r--r-- | pym/portage/dbapi/porttree.py | 5 | ||||
| -rw-r--r-- | pym/portage/tests/dep/test_src_uri.py | 1 |
2 files changed, 6 insertions, 0 deletions
diff --git a/pym/portage/dbapi/porttree.py b/pym/portage/dbapi/porttree.py index caff7f80..93730e9c 100644 --- a/pym/portage/dbapi/porttree.py +++ b/pym/portage/dbapi/porttree.py @@ -45,6 +45,11 @@ def _src_uri_validate(cpv, eapi, src_uri): uri = None _src_uri_validate(cpv, eapi, x) continue + if x == '||': + raise portage.exception.InvalidDependString( + ("getFetchMap(): '%s' SRC_URI contains invalid " + \ + "|| operator") % (cpv,)) + if x[-1:] == "?": if operator is not None: raise portage.exception.InvalidDependString( diff --git a/pym/portage/tests/dep/test_src_uri.py b/pym/portage/tests/dep/test_src_uri.py index 499d1e29..9955ca09 100644 --- a/pym/portage/tests/dep/test_src_uri.py +++ b/pym/portage/tests/dep/test_src_uri.py @@ -14,6 +14,7 @@ class SrcUri(TestCase): tests = [ ( "0", "http://foo/bar -> blah.tbz2" , False ), ( "1", "http://foo/bar -> blah.tbz2" , False ), + ( "2", "|| ( http://foo/bar -> blah.tbz2 )" , False ), ( "2", "http://foo/bar -> blah.tbz2" , True ), ( "2", "foo? ( http://foo/bar -> blah.tbz2 )" , True ), ( "2", "http://foo/bar -> foo? ( ftp://foo/a )" , False ), |