| 1 |
Author: zmedico |
| 2 |
Date: 2008-05-30 06:56:40 +0000 (Fri, 30 May 2008) |
| 3 |
New Revision: 10502 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/branches/2.1.2/bin/emerge |
| 7 |
Log: |
| 8 |
Make PackageSet.findAtomForPackage() just return the first atom found |
| 9 |
since best_match_to_list() won't work correctly for atoms matched |
| 10 |
via PROVIDE. (trunk r10501) |
| 11 |
|
| 12 |
|
| 13 |
Modified: main/branches/2.1.2/bin/emerge |
| 14 |
=================================================================== |
| 15 |
--- main/branches/2.1.2/bin/emerge 2008-05-30 06:50:34 UTC (rev 10501) |
| 16 |
+++ main/branches/2.1.2/bin/emerge 2008-05-30 06:56:40 UTC (rev 10502) |
| 17 |
@@ -818,10 +818,10 @@ |
| 18 |
None if there are no matches. This matches virtual arguments against |
| 19 |
the PROVIDE metadata. This can raise an InvalidDependString exception |
| 20 |
if an error occurs while parsing PROVIDE.""" |
| 21 |
- atoms = list(self.iterAtomsForPackage(pkg)) |
| 22 |
- if not atoms: |
| 23 |
+ try: |
| 24 |
+ return self.iterAtomsForPackage(pkg).next() |
| 25 |
+ except StopIteration: |
| 26 |
return None |
| 27 |
- return portage.best_match_to_list(pkg, atoms) |
| 28 |
|
| 29 |
def iterAtomsForPackage(self, pkg): |
| 30 |
""" |
| 31 |
|
| 32 |
-- |
| 33 |
gentoo-commits@l.g.o mailing list |
Archives