From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id F2829138247 for ; Wed, 1 Jan 2014 23:29:40 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6F519E08E1; Wed, 1 Jan 2014 23:29:40 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D0274E0815 for ; Wed, 1 Jan 2014 23:29:39 +0000 (UTC) Received: from [192.168.1.210] (S010600222de111ff.vc.shawcable.net [96.49.5.156]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) (Authenticated sender: dolsen) by smtp.gentoo.org (Postfix) with ESMTPSA id C22C033F4FA for ; Wed, 1 Jan 2014 23:29:38 +0000 (UTC) Message-ID: <1388618974.3753.0.camel@big_daddy.dol-sen.ca> Subject: Re: [gentoo-portage-dev] [PATCH 1/2] portdbapi.cp_list(): Don't write into xmatch's "match-all" cache From: Brian Dolbec To: gentoo-portage-dev@lists.gentoo.org Date: Wed, 01 Jan 2014 15:29:34 -0800 In-Reply-To: <1388616386-28967-1-git-send-email-SebastianLuther@gmx.de> References: <1388614451-18197-1-git-send-email-SebastianLuther@gmx.de> <1388616386-28967-1-git-send-email-SebastianLuther@gmx.de> Content-Type: multipart/signed; micalg="pgp-sha512"; protocol="application/pgp-signature"; boundary="=-sf9tzbLoK6EUyLv90erW" X-Mailer: Evolution 3.6.4 Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-portage-dev@lists.gentoo.org Reply-to: gentoo-portage-dev@lists.gentoo.org Mime-Version: 1.0 X-Archives-Salt: aa2ef176-7445-476c-93f9-1cff5536d6a1 X-Archives-Hash: a7c68f7d8dd1abc0c246b038aaa1342d --=-sf9tzbLoK6EUyLv90erW Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Wed, 2014-01-01 at 23:46 +0100, SebastianLuther@gmx.de wrote: > From: Sebastian Luther >=20 > 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(-) >=20 > diff --git a/pym/portage/dbapi/porttree.py b/pym/portage/dbapi/porttree.p= y > 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 =3D 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)] =3D cachelist > return cachelist[:] > mysplit =3D mycp.split("/") > invalid_category =3D mysplit[0] not in self._categories > @@ -796,7 +792,6 @@ class portdbapi(dbapi): > if self.frozen and mytree is None: > cachelist =3D mylist[:] > self.xcache["cp-list"][mycp] =3D cachelist > - self.xcache["match-all"][(mycp, mycp)] =3D cachelist > return mylist > =20 > def freeze(self): Sounds correct to me. Anyone object to committing this? --=-sf9tzbLoK6EUyLv90erW Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part Content-Transfer-Encoding: 7bit -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) iQF8BAABCgBmBQJSxKTfXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ4Njg4RkQxQ0M3MUMxQzA0RUFFQTQyMzcy MjE0RDkwQTAxNEYxN0NCAAoJECIU2QoBTxfLRQkIAJHXZ8ubiwQnCtgphD6tL2vg 6jqDzAtQ+VSY5reohvz0rTUwG4uxsvWVyqbnSJE/6VqL3RYD7c6aElIGCUjBCNoC 2DCfPqATmXPMU6TrHf/jsA1Q5NzUFXeacZ7/gffjk6KtZghBUrmdlsPEnUv41Cm+ r20NtcFdzhJzCe+7Ems1LEXG3XHHd3ByKIov7o/+ldbXRHIF9aJWjbAplnvV5wNP uMb95oIj+gVRCKYqK7icJpSYBkRqBc+VEQZyEJYP75UpCCk70ZppWsAayKg+WdEK Bghmiyi059i2LAeKnWWQKMj27iyzJ4GGeysC+KgNNcYSzVg1x+sgBV4pGZCEUpw= =aTWn -----END PGP SIGNATURE----- --=-sf9tzbLoK6EUyLv90erW--