From bbef438d87306f926fdbb4b62f2a120f58d47839 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Wed, 11 Mar 2009 03:21:01 +0000 Subject: [PATCH] Fix interaction between ignorelist and ignorecvs parameters inside cacheddir(). Thanks to Christian Ruppert for reporting. (trunk r12544) svn path=/main/branches/2.1.6/; revision=12830 --- 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 97ee03ec5..a468146ca 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]) -- 2.26.2