diff options
| author | Zac Medico <zmedico@gentoo.org> | 2008-05-30 21:20:11 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2008-05-30 21:20:11 +0000 |
| commit | df8d7c3a2a75c15905177c2b8418704968f20aa7 (patch) | |
| tree | aeb1359acf5c131861bd426d30c3e7ce955e38a0 /pym | |
| parent | 0d50616cd1628b380616f96609234f76feeef428 (diff) | |
| download | portage-df8d7c3a2a75c15905177c2b8418704968f20aa7.tar.gz portage-df8d7c3a2a75c15905177c2b8418704968f20aa7.tar.bz2 portage-df8d7c3a2a75c15905177c2b8418704968f20aa7.zip | |
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
Diffstat (limited to 'pym')
| -rw-r--r-- | pym/portage.py | 8 |
1 files changed, 4 insertions, 4 deletions
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 |