From 0ae2d2911e58216911600df700a9787bcf1bc3b9 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Tue, 19 Feb 2008 08:27:22 +0000 Subject: 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 --- pym/portage/sets/files.py | 11 ++++++----- 1 file 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) -- cgit v1.2.3-1-g7c22