From d78214739540fa64012fbc03f1e912edda07c53d Mon Sep 17 00:00:00 2001 From: René 'Necoro' Neumann Date: Thu, 5 Nov 2009 13:17:15 +0100 Subject: Better slot handling in packages. --- portato/backend/portage/package.py | 2 +- portato/backend/portage/system.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'portato/backend/portage') diff --git a/portato/backend/portage/package.py b/portato/backend/portage/package.py index 79af79b..f108bde 100644 --- a/portato/backend/portage/package.py +++ b/portato/backend/portage/package.py @@ -299,5 +299,5 @@ class PortagePackage (Package): def matches (self, criterion): # cpv_matches needs explicit slot info - scpv = "%s:%s" % (self.get_cpv(), self.get_package_settings("SLOT")) + scpv = ":".join(self.get_cpv(), self.get_slot()) return system.cpv_matches(scpv, criterion) diff --git a/portato/backend/portage/system.py b/portato/backend/portage/system.py index 83eb37a..03e3955 100644 --- a/portato/backend/portage/system.py +++ b/portato/backend/portage/system.py @@ -280,9 +280,9 @@ class PortageSystem (SystemInterface): if len(inst) > 1: myslots = set() for i in inst: # get the slots of the installed packages - myslots.add(i.get_package_settings("SLOT")) + myslots.add(i.get_slot()) - myslots.add(best_p.get_package_settings("SLOT")) # add the slot of the best package in portage + myslots.add(best_p.get_slot()) # add the slot of the best package in portage for slot in myslots: crit = "%s:%s" % (p, slot) append(crit, self.find_best_match(crit), inst) -- cgit v1.2.3-54-g00ecf