From: Zac Medico <zmedico@gentoo.org>
Date: Thu, 22 Jan 2009 00:43:44 +0000 (-0000)
Subject: Fix interaction between ignorelist and ignorecvs parameters inside cacheddir().
X-Git-Tag: v2.2_rc24~253
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=d99c1bd02d4cf6e9970a65b6f1947d4d6a9e3d91;p=portage.git

Fix interaction between ignorelist and ignorecvs parameters inside cacheddir().
Thanks to Christian Ruppert for reporting.

svn path=/main/trunk/; revision=12544
---

diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py
index 19a0ab656..77254bad4 100644
--- a/pym/portage/__init__.py
+++ b/pym/portage/__init__.py
@@ -252,10 +252,13 @@ def cacheddir(my_original_path, ignorecvs, ignorelist, EmptyOnError, followSymli
 	ret_list = []
 	ret_ftype = []
 	for x in range(0, len(list)):
-		if(ignorecvs and (len(list[x]) > 2) and (list[x][:2]!=".#")):
-			ret_list.append(list[x])
-			ret_ftype.append(ftype[x])
-		elif (list[x] not in ignorelist):
+		if list[x] in ignorelist:
+			pass
+		elif ignorecvs:
+			if list[x][:2] != ".#":
+				ret_list.append(list[x])
+				ret_ftype.append(ftype[x])
+		else:
 			ret_list.append(list[x])
 			ret_ftype.append(ftype[x])