From: Zac Medico <zmedico@gentoo.org>
Date: Tue, 10 Mar 2009 05:16:11 +0000 (-0000)
Subject: Remove redundant conditional inside _src_uri_validate().
X-Git-Tag: v2.2_rc24~5
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e40282011279ed59bc87c7ee3d1811a0cfcf19e2;p=portage.git

Remove redundant conditional inside _src_uri_validate().

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

diff --git a/pym/portage/dbapi/porttree.py b/pym/portage/dbapi/porttree.py
index 8dcdf1b85..caff7f80f 100644
--- a/pym/portage/dbapi/porttree.py
+++ b/pym/portage/dbapi/porttree.py
@@ -69,15 +69,19 @@ def _src_uri_validate(cpv, eapi, src_uri):
 		if operator is None:
 			uri = x
 			continue
-		if operator is not None:
-			if "/" in x:
-				raise portage.exception.InvalidDependString(
-					("getFetchMap(): '%s' SRC_URI '/' character in " + \
-					"file name: '%s'") % (cpv, x))
-			if x[-1:] == "?":
-				raise portage.exception.InvalidDependString(
-					("getFetchMap(): '%s' SRC_URI arrow missing " + \
-					"right operand") % (cpv,))
+
+		# This should be the right operand of an arrow operator.
+		if "/" in x:
+			raise portage.exception.InvalidDependString(
+				("getFetchMap(): '%s' SRC_URI '/' character in " + \
+				"file name: '%s'") % (cpv, x))
+
+		if x[-1:] == "?":
+			raise portage.exception.InvalidDependString(
+				("getFetchMap(): '%s' SRC_URI arrow missing " + \
+				"right operand") % (cpv,))
+
+		# Found the right operand, so reset state.
 		uri = None
 		operator = None