Re: [gentoo-portage-dev] [PATCH 1/2] portdbapi.cp_list(): Don't write into xmatch's "match-all" cache

[Brian Dolbec <dolsen@gentoo.org>]

[-- Attachment #1: Type: text/plain, Size: 1526 bytes --]

On Wed, 2014-01-01 at 23:46 +0100, SebastianLuther@gmx.de wrote:
> From: Sebastian Luther <SebastianLuther@gmx.de>
> 
> xmatch returns _pkg_str instances these days. They require metadata
> access, which cp_list doesn't have. That means that writing cp_list
> results into the xmatch cache breaks xmatch users that expect _pkg_str
> instances with full metadata.
> ---
>  pym/portage/dbapi/porttree.py | 5 -----
>  1 file changed, 5 deletions(-)
> 
> diff --git a/pym/portage/dbapi/porttree.py b/pym/portage/dbapi/porttree.py
> index fc3fc03..53b9648 100644
> --- a/pym/portage/dbapi/porttree.py
> +++ b/pym/portage/dbapi/porttree.py
> @@ -741,10 +741,6 @@ class portdbapi(dbapi):
>  		if self.frozen and mytree is None:
>  			cachelist = self.xcache["cp-list"].get(mycp)
>  			if cachelist is not None:
> -				# Try to propagate this to the match-all cache here for
> -				# repoman since he uses separate match-all caches for each
> -				# profile (due to differences in _get_implicit_iuse).
> -				self.xcache["match-all"][(mycp, mycp)] = cachelist
>  				return cachelist[:]
>  		mysplit = mycp.split("/")
>  		invalid_category = mysplit[0] not in self._categories
> @@ -796,7 +792,6 @@ class portdbapi(dbapi):
>  		if self.frozen and mytree is None:
>  			cachelist = mylist[:]
>  			self.xcache["cp-list"][mycp] = cachelist
> -			self.xcache["match-all"][(mycp, mycp)] = cachelist
>  		return mylist
>  
>  	def freeze(self):

Sounds correct to me.  Anyone object to committing this?

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 620 bytes --]