diff options
| author | Zac Medico <zmedico@gentoo.org> | 2008-03-30 22:08:31 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2008-03-30 22:08:31 +0000 |
| commit | 60dabd2443bb6a7c99c8a1ad360f80aad5670a79 (patch) | |
| tree | 0386aa46a8b06c9c71a6da1533b5d2e9f691b14c /pym | |
| parent | 0242efb5ec97e2c8260b6dca3eb58a7cfcc62a47 (diff) | |
| download | portage-60dabd2443bb6a7c99c8a1ad360f80aad5670a79.tar.gz portage-60dabd2443bb6a7c99c8a1ad360f80aad5670a79.tar.bz2 portage-60dabd2443bb6a7c99c8a1ad360f80aad5670a79.zip | |
When dblink.treewalk() queries for other packages in the same slot, filter
out old-style virtual matches since they are not desired. (trunk r9637)
svn path=/main/branches/2.1.2/; revision=9640
Diffstat (limited to 'pym')
| -rw-r--r-- | pym/portage.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/pym/portage.py b/pym/portage.py index be62d09f9..1b00a91fd 100644 --- a/pym/portage.py +++ b/pym/portage.py @@ -8867,8 +8867,11 @@ class dblink: for v in self.vartree.dbapi.cp_list(self.mysplit[0]): otherversions.append(v.split("/")[1]) - slot_matches = self.vartree.dbapi.match( - "%s:%s" % (self.mysplit[0], slot)) + # filter any old-style virtual matches + slot_matches = [cpv for cpv in self.vartree.dbapi.match( + "%s:%s" % (cpv_getkey(self.mycpv), slot)) \ + if cpv_getkey(cpv) == cpv_getkey(self.mycpv)] + if self.mycpv not in slot_matches and \ self.vartree.dbapi.cpv_exists(self.mycpv): # handle multislot or unapplied slotmove |