diff options
| author | Zac Medico <zmedico@gentoo.org> | 2008-02-19 01:53:45 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2008-02-19 01:53:45 +0000 |
| commit | 326855e0ac6e0b6296d727ffcfa8b8a4e514f584 (patch) | |
| tree | 76ee22fb026fd889d3b5b37b5e3921daf77cb8da | |
| parent | 5386d738b118736a929876e9d1fca11dce588c0b (diff) | |
| download | portage-326855e0ac6e0b6296d727ffcfa8b8a4e514f584.tar.gz portage-326855e0ac6e0b6296d727ffcfa8b8a4e514f584.tar.bz2 portage-326855e0ac6e0b6296d727ffcfa8b8a4e514f584.zip | |
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
| -rw-r--r-- | pym/portage/sets/dbapi.py | 6 |
1 files 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 |