diff options
| author | Zac Medico <zmedico@gentoo.org> | 2009-03-11 03:21:01 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2009-03-11 03:21:01 +0000 |
| commit | bbef438d87306f926fdbb4b62f2a120f58d47839 (patch) | |
| tree | c58ec71acb412a9c22eb147e833c51f1c222d634 | |
| parent | cf80605e9a065ed0f622855a01444094977764ed (diff) | |
| download | portage-bbef438d87306f926fdbb4b62f2a120f58d47839.tar.gz portage-bbef438d87306f926fdbb4b62f2a120f58d47839.tar.bz2 portage-bbef438d87306f926fdbb4b62f2a120f58d47839.zip | |
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
| -rw-r--r-- | pym/portage/__init__.py | 11 |
1 files 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]) |