From: Zac Medico Date: Fri, 3 Jul 2009 09:05:39 +0000 (-0000) Subject: Skip PROVIDE conditional evaluation in PackageSet.iterAtomsForPackage(), since X-Git-Tag: v2.2_rc34~98 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=9cd6e31c3fbd6fe36d33c801222812f4ae189b03;p=portage.git Skip PROVIDE conditional evaluation in PackageSet.iterAtomsForPackage(), since Package.metadata handles that automatically now. svn path=/main/trunk/; revision=13764 --- diff --git a/pym/portage/sets/base.py b/pym/portage/sets/base.py index 370b03d45..87a0d1db7 100644 --- a/pym/portage/sets/base.py +++ b/pym/portage/sets/base.py @@ -142,10 +142,10 @@ class PackageSet(object): for atom in atoms: if match_from_list(atom, cpv_slot_list): yield atom - if not pkg.metadata["PROVIDE"]: + provides = pkg.metadata['PROVIDE'] + if not provides: return - provides = flatten(use_reduce(paren_reduce(pkg.metadata["PROVIDE"]), - uselist=pkg.metadata["USE"].split())) + provides = provides.split() for provide in provides: provided_cp = dep_getkey(provide) atoms = self._atommap.get(provided_cp)