Add a 'trees' parameter to portdbapi.cp_all(). Thanks to Brian Dolbec (dol-sen)

for this patch. (trunk r15356)

svn path=/main/branches/2.1.7/; revision=15583

diff --git a/pym/portage/dbapi/porttree.py b/pym/portage/dbapi/porttree.py
index 5a845118daad863353dbfe744e05699a325f33ce..6012cd41411de6225ef578acbff2b98db5b54f9a 100644 (file)
--- a/pym/portage/dbapi/porttree.py
+++ b/pym/portage/dbapi/porttree.py
@@ -901,13 +901,22 @@ class portdbapi(dbapi):
                else:
                        return 0
 
-       def cp_all(self, categories=None):
-               "returns a list of all keys in our tree"
+       def cp_all(self, categories=None, trees=None):
+               """
+               This returns a list of all keys in our tree or trees
+               @param categories: optional list of categories to search or 
+                       defaults to self.settings.categories
+               @param trees: optional list of trees to search the categories in or
+                       defaults to self.porttrees
+               @rtype list of [cat/pkg,...]
+               """
                d = {}
                if categories is None:
                        categories = self.settings.categories
+               if trees is None:
+                       trees = self.porttrees
                for x in categories:
-                       for oroot in self.porttrees:
+                       for oroot in trees:
                                for y in listdir(oroot+"/"+x, EmptyOnError=1, ignorecvs=1, dirsonly=1):
                                        if not self._pkg_dir_name_re.match(y) or \
                                                y == "CVS":