From 19b88931cb438d058b60f2e56928839d12e22456 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Wed, 17 Oct 2012 20:06:45 -0700 Subject: LibraryConsumerSet: fix for EAPI 5 sub-slot --- pym/portage/_sets/libs.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pym/portage/_sets/libs.py b/pym/portage/_sets/libs.py index 6c5babc13..27ef50e71 100644 --- a/pym/portage/_sets/libs.py +++ b/pym/portage/_sets/libs.py @@ -1,4 +1,4 @@ -# Copyright 2007-2011 Gentoo Foundation +# Copyright 2007-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 from __future__ import print_function @@ -6,7 +6,6 @@ from __future__ import print_function from portage.localization import _ from portage._sets.base import PackageSet from portage._sets import get_boolean, SetConfigError -from portage.versions import cpv_getkey import portage class LibraryConsumerSet(PackageSet): @@ -22,14 +21,14 @@ class LibraryConsumerSet(PackageSet): for p in paths: for cpv in self.dbapi._linkmap.getOwners(p): try: - slot, = self.dbapi.aux_get(cpv, ["SLOT"]) + pkg = self.dbapi._pkg_str(cpv, None) except KeyError: # This is expected for preserved libraries # of packages that have been uninstalled # without replacement. pass else: - rValue.add("%s:%s" % (cpv_getkey(cpv), slot)) + rValue.add("%s:%s" % (pkg.cp, pkg.slot)) return rValue class LibraryFileConsumerSet(LibraryConsumerSet): -- cgit v1.2.3-1-g7c22