Make portage.listdir(ignorecvs=1) omit CVS dirs.

diff --git a/pym/portage/util/listdir.py b/pym/portage/util/listdir.py
index f73c9702556634b29a89b4b645f43efcfd90d71d..64d1a88b510b0b552830ab16bcd67c53279534d5 100644 (file)
--- a/pym/portage/util/listdir.py
+++ b/pym/portage/util/listdir.py
@@ -76,7 +76,8 @@ def cacheddir(my_original_path, ignorecvs, ignorelist, EmptyOnError, followSymli
                if list[x] in ignorelist:
                        pass
                elif ignorecvs:
-                       if list[x][:2] != ".#":
+                       if list[x][:2] != ".#" and \
+                               not (ftype[x] == 1 and list[x] in _ignorecvs_dirs):
                                ret_list.append(list[x])
                                ret_ftype.append(ftype[x])
                else: