From: Zac Medico <zmedico@gentoo.org>
Date: Tue, 10 Mar 2009 05:24:08 +0000 (-0000)
Subject: Make _src_uri_validate() identify the || operator as invalid and add a
X-Git-Tag: v2.2_rc24~4
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=8ebc64df649d8eee10185ec5c7cf54428ee1d9ba;p=portage.git

Make _src_uri_validate() identify the || operator as invalid and add a
corresponding test case.

svn path=/main/trunk/; revision=12820
---

diff --git a/pym/portage/dbapi/porttree.py b/pym/portage/dbapi/porttree.py
index caff7f80f..93730e9c3 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 499d1e295..9955ca096 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 ),