diff options
| author | Zac Medico <zmedico@gentoo.org> | 2009-03-11 06:22:00 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2009-03-11 06:22:00 +0000 |
| commit | f29be32f283b694c2179522d451ae6195ef23125 (patch) | |
| tree | 74827ae90cba7400874b352c40df93e7c35e3be3 | |
| parent | 1288698d4bfac847fdc621b3d1687f3d0b3ebe07 (diff) | |
| download | portage-f29be32f283b694c2179522d451ae6195ef23125.tar.gz portage-f29be32f283b694c2179522d451ae6195ef23125.tar.bz2 portage-f29be32f283b694c2179522d451ae6195ef23125.zip | |
Fix a case in which a SRC_URI is incorrectly idendified as invalid, and add
a corresponding test case. Thanks to Jacob Floyd for reporting. (trunk r12716)
svn path=/main/branches/2.1.6/; revision=12971
| -rw-r--r-- | pym/portage/dbapi/porttree.py | 3 | ||||
| -rw-r--r-- | pym/portage/tests/dep/test_src_uri.py | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/pym/portage/dbapi/porttree.py b/pym/portage/dbapi/porttree.py index ab5e9ba13..5fcb50ce5 100644 --- a/pym/portage/dbapi/porttree.py +++ b/pym/portage/dbapi/porttree.py @@ -66,6 +66,9 @@ def _src_uri_validate(cpv, eapi, src_uri): "supported with EAPI='%s'") % (cpv, eapi)) operator = x continue + if operator is None: + uri = x + continue if operator is not None: if "/" in x: 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 84c9f29b6..e53297968 100644 --- a/pym/portage/tests/dep/test_src_uri.py +++ b/pym/portage/tests/dep/test_src_uri.py @@ -23,6 +23,7 @@ class SrcUri(TestCase): ( "2", "http://foo/bar ->" , False ), ( "2", "foo? ( http://foo/bar -> ) blah.tbz2" , False ), ( "2", "http://foo/bar -> foo/blah.tbz2" , False ), + ( "2", "http://foo.com/foo http://foo/bar -> blah.tbz2" , True ), ] for eapi, src_uri, valid in tests: |