diff options
| author | Zac Medico <zmedico@gentoo.org> | 2009-07-03 09:05:39 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2009-07-03 09:05:39 +0000 |
| commit | 9cd6e31c3fbd6fe36d33c801222812f4ae189b03 (patch) | |
| tree | 466f3e596345d35e8f8125211825ee2e7b7b7a6e /pym | |
| parent | a13ac54650d4da05e2498d43eeb0e351af8b92c4 (diff) | |
| download | portage-9cd6e31c3fbd6fe36d33c801222812f4ae189b03.tar.gz portage-9cd6e31c3fbd6fe36d33c801222812f4ae189b03.tar.bz2 portage-9cd6e31c3fbd6fe36d33c801222812f4ae189b03.zip | |
Skip PROVIDE conditional evaluation in PackageSet.iterAtomsForPackage(), since
Package.metadata handles that automatically now.
svn path=/main/trunk/; revision=13764
Diffstat (limited to 'pym')
| -rw-r--r-- | pym/portage/sets/base.py | 6 |
1 files changed, 3 insertions, 3 deletions
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) |