aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2011-01-16 06:20:23 -0800
committerZac Medico <zmedico@gentoo.org>2011-01-16 06:20:23 -0800
commit956a2a70446e7618ef29593ed710648ca2b1e19f (patch)
tree825411608dafab9968ef9e5309d32c6baea92229 /pym/portage/util/listdir.py
parentAdd missing InvalidAtom import from prev commit. (diff)
downloadportage-956a2a70446e7618ef29593ed710648ca2b1e19f.tar.gz
portage-956a2a70446e7618ef29593ed710648ca2b1e19f.tar.bz2
portage-956a2a70446e7618ef29593ed710648ca2b1e19f.zip
Make portage.listdir(ignorecvs=1) omit CVS dirs.
Diffstat (limited to 'pym/portage/util/listdir.py')
-rw-r--r--pym/portage/util/listdir.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/pym/portage/util/listdir.py b/pym/portage/util/listdir.py
index f73c97025..64d1a88b5 100644
--- 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: