From 326855e0ac6e0b6296d727ffcfa8b8a4e514f584 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Tue, 19 Feb 2008 01:53:45 +0000 Subject: Make LibraryConsumerSet.mapPathsToAtoms() produce slot atoms so that atoms aren't restricted to the currently installed version, making upgrades possible. svn path=/main/trunk/; revision=9351 --- pym/portage/sets/dbapi.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pym/portage/sets/dbapi.py b/pym/portage/sets/dbapi.py index a1b902fdc..220ff2283 100644 --- a/pym/portage/sets/dbapi.py +++ b/pym/portage/sets/dbapi.py @@ -126,8 +126,10 @@ class LibraryConsumerSet(PackageSet): link = dblink(mysplit[0], mysplit[1], myroot=self.dbapi.root, \ mysettings=self.dbapi.settings, treetype='vartree', \ vartree=self.dbapi.vartree) - if paths.intersection(link.getcontents().keys()): - rValue.add("/".join(catpkgsplit(cpv)[:2])) + if paths.intersection(link.getcontents()): + cat, pn = catpkgsplit(cpv)[:2] + slot = self.dbapi.aux_get(cpv, ["SLOT"])[0] + rValue.add("%s/%s:%s" % (cat, pn, slot)) return rValue -- cgit v1.2.3-1-g7c22