From: Zac Medico <zmedico@gentoo.org>
Date: Sun, 16 Jan 2011 14:20:23 +0000 (-0800)
Subject: Make portage.listdir(ignorecvs=1) omit CVS dirs.
X-Git-Tag: v2.1.9.32~6
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=ec050c06b9ed04ea5991578df1dafcb9d50861ca;p=portage.git

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

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: