| 1 |
Author: zmedico |
| 2 |
Date: 2008-05-09 02:15:10 +0000 (Fri, 09 May 2008) |
| 3 |
New Revision: 10257 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/branches/2.1.2/bin/emerge |
| 7 |
Log: |
| 8 |
Make the fix for bug #220341 better by checking all selected packages for |
| 9 |
matching cpv rather than just the last one. (trunk r10256) |
| 10 |
|
| 11 |
|
| 12 |
Modified: main/branches/2.1.2/bin/emerge |
| 13 |
=================================================================== |
| 14 |
--- main/branches/2.1.2/bin/emerge 2008-05-09 02:14:38 UTC (rev 10256) |
| 15 |
+++ main/branches/2.1.2/bin/emerge 2008-05-09 02:15:10 UTC (rev 10257) |
| 16 |
@@ -3092,9 +3092,11 @@ |
| 17 |
# Therefore, assume that such SLOT dependencies are already |
| 18 |
# satisfied rather than forcing a rebuild. |
| 19 |
if installed and not cpv_list and matched_packages \ |
| 20 |
- and vardb.cpv_exists(matched_packages[-1].cpv) and \ |
| 21 |
- portage_dep.dep_getslot(atom): |
| 22 |
- cpv_list = [matched_packages[-1].cpv] |
| 23 |
+ and portage_dep.dep_getslot(atom): |
| 24 |
+ for pkg in matched_packages: |
| 25 |
+ if vardb.cpv_exists(pkg.cpv): |
| 26 |
+ cpv_list = [pkg.cpv] |
| 27 |
+ break |
| 28 |
|
| 29 |
if not cpv_list: |
| 30 |
continue |
| 31 |
|
| 32 |
-- |
| 33 |
gentoo-commits@l.g.o mailing list |
Archives