| 1 |
Author: zmedico |
| 2 |
Date: 2008-03-30 21:54:51 +0000 (Sun, 30 Mar 2008) |
| 3 |
New Revision: 9637 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/trunk/pym/portage/dbapi/vartree.py |
| 7 |
Log: |
| 8 |
When dblink.treewalk() queries for other packages in the same slot, filter |
| 9 |
out old-style virtual matches since they are not desired. |
| 10 |
|
| 11 |
|
| 12 |
Modified: main/trunk/pym/portage/dbapi/vartree.py |
| 13 |
=================================================================== |
| 14 |
--- main/trunk/pym/portage/dbapi/vartree.py 2008-03-30 21:40:42 UTC (rev 9636) |
| 15 |
+++ main/trunk/pym/portage/dbapi/vartree.py 2008-03-30 21:54:51 UTC (rev 9637) |
| 16 |
@@ -21,7 +21,7 @@ |
| 17 |
|
| 18 |
from portage import listdir, dep_expand, flatten, key_expand, \ |
| 19 |
doebuild_environment, doebuild, env_update, prepare_build_dirs, \ |
| 20 |
- abssymlink, movefile, _movefile, bsd_chflags |
| 21 |
+ abssymlink, movefile, _movefile, bsd_chflags, cpv_getkey |
| 22 |
|
| 23 |
from portage.elog import elog_process |
| 24 |
from portage.elog.messages import ewarn |
| 25 |
@@ -1834,8 +1834,11 @@ |
| 26 |
for v in self.vartree.dbapi.cp_list(self.mysplit[0]): |
| 27 |
otherversions.append(v.split("/")[1]) |
| 28 |
|
| 29 |
- slot_matches = self.vartree.dbapi.match( |
| 30 |
- "%s:%s" % (self.mysplit[0], slot)) |
| 31 |
+ # filter any old-style virtual matches |
| 32 |
+ slot_matches = [cpv for cpv in self.vartree.dbapi.match( |
| 33 |
+ "%s:%s" % (cpv_getkey(self.mycpv), slot)) \ |
| 34 |
+ if cpv_getkey(cpv) == cpv_getkey(self.mycpv)] |
| 35 |
+ |
| 36 |
if self.mycpv not in slot_matches and \ |
| 37 |
self.vartree.dbapi.cpv_exists(self.mycpv): |
| 38 |
# handle multislot or unapplied slotmove |
| 39 |
|
| 40 |
-- |
| 41 |
gentoo-commits@l.g.o mailing list |
Archives