From: Zac Medico <zmedico@gentoo.org>
Date: Tue, 9 Oct 2007 09:26:49 +0000 (-0000)
Subject: Properly exclude old-style virtuals from the portdbapi.cp_list() cache.
X-Git-Tag: v2.2_pre1~679
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=757a424094dae1c44f07d28bc8368a7574392d66;p=portage.git

Properly exclude old-style virtuals from the portdbapi.cp_list() cache.

svn path=/main/trunk/; revision=8010
---

diff --git a/pym/portage/dbapi/porttree.py b/pym/portage/dbapi/porttree.py
index d47f6fd9d..d6fd4a172 100644
--- a/pym/portage/dbapi/porttree.py
+++ b/pym/portage/dbapi/porttree.py
@@ -501,7 +501,8 @@ class portdbapi(dbapi):
 	def cp_list(self, mycp, use_cache=1, mytree=None):
 		if self.frozen and mytree is None:
 			mylist = self.xcache["match-all"].get(mycp)
-			if mylist is not None:
+			# cp_list() doesn't expand old-style virtuals
+			if mylist and mylist[0].startswith(mycp):
 				return mylist[:]
 		mysplit = mycp.split("/")
 		invalid_category = mysplit[0] not in self._categories
@@ -527,7 +528,8 @@ class portdbapi(dbapi):
 		else:
 			mylist = d.keys()
 		if self.frozen and mytree is None:
-			self.xcache["match-all"][mycp] = mylist[:]
+			if not (not mylist and mycp.startswith("virtual/")):
+				self.xcache["match-all"][mycp] = mylist[:]
 		return mylist
 
 	def freeze(self):