diff options
| author | Zac Medico <zmedico@gentoo.org> | 2008-02-19 08:27:22 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2008-02-19 08:27:22 +0000 |
| commit | 0ae2d2911e58216911600df700a9787bcf1bc3b9 (patch) | |
| tree | e056a28f3cef6f246e4c4760101e2cc99cc1a1fc | |
| parent | 909e54fcd65114391a98808eba1b89f2024df1de (diff) | |
| download | portage-0ae2d2911e58216911600df700a9787bcf1bc3b9.tar.gz portage-0ae2d2911e58216911600df700a9787bcf1bc3b9.tar.bz2 portage-0ae2d2911e58216911600df700a9787bcf1bc3b9.zip | |
For greedy slot behavior, in addition to any installed slots also
try to pull in the latest new slot that may be available.
svn path=/main/trunk/; revision=9359
| -rw-r--r-- | pym/portage/sets/files.py | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/pym/portage/sets/files.py b/pym/portage/sets/files.py index cc4862cc8..683756ec5 100644 --- a/pym/portage/sets/files.py +++ b/pym/portage/sets/files.py @@ -79,11 +79,12 @@ class StaticFileSet(EditablePackageSet): atoms = [] for a in data.keys(): matches = self.dbapi.match(a) - if len(matches) > 1: - for cpv in matches: - atoms.append(dep_getkey(cpv)+":"+self.dbapi.aux_get(cpv, ["SLOT"])[0]) - else: - atoms.append(a) + for cpv in matches: + atoms.append("%s:%s" % (cpv_getkey(cpv), + self.dbapi.aux_get(cpv, ["SLOT"])[0])) + # In addition to any installed slots, also try to pull + # in the latest new slot that may be available. + atoms.append(a) else: atoms = data.keys() self._setAtoms(atoms) |