diff options
| author | René 'Necoro' Neumann <necoro@necoro.net> | 2009-11-05 13:17:15 +0100 |
|---|---|---|
| committer | René 'Necoro' Neumann <necoro@necoro.net> | 2009-11-05 13:17:15 +0100 |
| commit | d78214739540fa64012fbc03f1e912edda07c53d (patch) | |
| tree | fd39bf8ea0162005958f2e211c6947ae1ff88c42 /portato/backend/portage | |
| parent | 4a067c072e3eaa65cb434307ea4e9280d3af9b68 (diff) | |
| download | portato-d78214739540fa64012fbc03f1e912edda07c53d.tar.gz portato-d78214739540fa64012fbc03f1e912edda07c53d.tar.bz2 portato-d78214739540fa64012fbc03f1e912edda07c53d.zip | |
Better slot handling in packages.
Diffstat (limited to 'portato/backend/portage')
| -rw-r--r-- | portato/backend/portage/package.py | 2 | ||||
| -rw-r--r-- | portato/backend/portage/system.py | 4 |
2 files changed, 3 insertions, 3 deletions
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) |