From d99c1bd02d4cf6e9970a65b6f1947d4d6a9e3d91 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Thu, 22 Jan 2009 00:43:44 +0000 Subject: Fix interaction between ignorelist and ignorecvs parameters inside cacheddir(). Thanks to Christian Ruppert for reporting. svn path=/main/trunk/; revision=12544 --- pym/portage/__init__.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) 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]) -- cgit v1.2.3-1-g7c22