From: Zac Medico <zmedico@gentoo.org>
Date: Fri, 30 May 2008 21:20:11 +0000 (-0000)
Subject: Now that dbapi._iter_match() is guaranteed to return a real iterator with
X-Git-Tag: v2.1.5.3~13
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=df8d7c3a2a75c15905177c2b8418704968f20aa7;p=portage.git

Now that dbapi._iter_match() is guaranteed to return a real iterator with
a next() method, we can just call next() and handle StopIteration.
(trunk r10509)

svn path=/main/branches/2.1.2/; revision=10510
---

diff --git a/pym/portage.py b/pym/portage.py
index eb6882f47..3219a2dcc 100644
--- a/pym/portage.py
+++ b/pym/portage.py
@@ -7879,10 +7879,10 @@ class portdbapi(dbapi):
 			cpv_iter = iter(self.cp_list(mykey))
 			if mydep != mykey:
 				cpv_iter = self._iter_match(mydep, cpv_iter)
-			myval = ""
-			for cpv in cpv_iter:
-				myval = cpv
-				break
+			try:
+				myval = cpv_iter.next()
+			except StopIteration:
+				myval = ""
 
 		elif level in ("minimum-visible", "bestmatch-visible"):
 			# Find the minimum matching visible version. This is optimized to