Remove some redunant categories code.
authorZac Medico <zmedico@gentoo.org>
Thu, 20 Dec 2007 16:26:25 +0000 (16:26 -0000)
committerZac Medico <zmedico@gentoo.org>
Thu, 20 Dec 2007 16:26:25 +0000 (16:26 -0000)
svn path=/main/branches/2.1.2/; revision=8996

pym/portage.py

index cb69a9c56cb5a68c367f1ad2d6e69ef66cc07abb..abe0ebb737c05c15648729869884de1a46e4ae52 100644 (file)
@@ -6270,14 +6270,9 @@ class vardbapi(dbapi):
                        del self.cpcache[mycp]
                return returnme
 
-       def cpv_all(self,use_cache=1):
-               returnme=[]
-               basepath = self.root+VDB_PATH+"/"
-               categories = self.categories
-               if not categories:
-                       categories = [cat for cat in listdir(basepath, dirsonly=True) \
-                               if self._category_re.match(cat)]
-                       self.categories = categories
+       def cpv_all(self, use_cache=1):
+               returnme = []
+               basepath = os.path.join(self.root, VDB_PATH) + os.path.sep
                for x in listdir(basepath, EmptyOnError=1, ignorecvs=1, dirsonly=1):
                        if not self._category_re.match(x):
                                continue