summaryrefslogtreecommitdiff
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 12:38:00 -0800
commitec050c06b9ed04ea5991578df1dafcb9d50861ca (patch)
treeaae05887fda3b88cdadaf9911bfde4695152fb61
parentAdd missing InvalidAtom import from prev commit. (diff)
downloadportage-ec050c06b9ed04ea5991578df1dafcb9d50861ca.tar.gz
portage-ec050c06b9ed04ea5991578df1dafcb9d50861ca.tar.bz2
portage-ec050c06b9ed04ea5991578df1dafcb9d50861ca.zip
Make portage.listdir(ignorecvs=1) omit CVS dirs.
-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: