Bug #220171 - Filter out 'lost+found' directories in vardbapi.cpv_all()

in order to avoid fatal 'Permission denied' errors. Currently, CVS and
names beginning with '.' are also filtered.

svn path=/main/trunk/; revision=10192

diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py
index a72d0edca5b2f891eb457bf1f7c01957d8d70b95..6b22704f711e3c4cd32534f46f7be554f5bbe7ca 100644 (file)
--- a/pym/portage/dbapi/vartree.py
+++ b/pym/portage/dbapi/vartree.py
@@ -223,6 +223,12 @@ class LinkageMap(object):
                return rValue
                                        
 class vardbapi(dbapi):
+
+       _excluded_dirs = ["CVS", "lost+found"]
+       _excluded_dirs = [re.escape(x) for x in _excluded_dirs]
+       _excluded_dirs = re.compile(r'^(\..*|' + \
+               "|".join(_excluded_dirs) + r')$')
+
        def __init__(self, root, categories=None, settings=None, vartree=None):
                """
                The categories parameter is unused since the dbapi class
@@ -443,10 +449,12 @@ class vardbapi(dbapi):
                returnme = []
                basepath = os.path.join(self.root, VDB_PATH) + os.path.sep
                for x in listdir(basepath, EmptyOnError=1, ignorecvs=1, dirsonly=1):
+                       if self._excluded_dirs.match(x) is not None:
+                               continue
                        if not self._category_re.match(x):
                                continue
                        for y in listdir(basepath + x, EmptyOnError=1):
-                               if y.startswith("."):
+                               if self._excluded_dirs.match(y) is not None:
                                        continue
                                subpath = x + "/" + y
                                # -MERGING- should never be a cpv, nor should files.