From: Zac Medico <zmedico@gentoo.org>
Date: Sat, 28 Aug 2010 02:15:50 +0000 (-0700)
Subject: Use StopIteration to exit nested loops.
X-Git-Tag: v2.2_rc70
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=be0a2cb03d5017da1bfa085b89347608988ccdf1;p=portage.git

Use StopIteration to exit nested loops.
---

diff --git a/pym/portage/dep/__init__.py b/pym/portage/dep/__init__.py
index c5f6a0b63..382a4f611 100644
--- a/pym/portage/dep/__init__.py
+++ b/pym/portage/dep/__init__.py
@@ -1087,11 +1087,15 @@ class Atom(_atom_base):
 						% (eapi, self), category='EAPI.incompatible')
 				if is_valid_flag is not None and self.use.conditional:
 					invalid_flag = None
-					for conditional_type, flags in self.use.conditional.items():
-						for flag in flags:
-							if not is_valid_flag(flag):
-								invalid_flag = (conditional_type, flag)
-								break
+					try:
+						for conditional_type, flags in \
+							self.use.conditional.items():
+							for flag in flags:
+								if not is_valid_flag(flag):
+									invalid_flag = (conditional_type, flag)
+									raise StopIteration()
+					except StopIteration:
+						pass
 					if invalid_flag is not None:
 						conditional_type, flag = invalid_flag
 						conditional_str = _use_dep._conditional_strings[conditional_type]