| 1 |
Author: zmedico |
| 2 |
Date: 2009-01-22 00:43:44 +0000 (Thu, 22 Jan 2009) |
| 3 |
New Revision: 12544 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/trunk/pym/portage/__init__.py |
| 7 |
Log: |
| 8 |
Fix interaction between ignorelist and ignorecvs parameters inside cacheddir(). |
| 9 |
Thanks to Christian Ruppert for reporting. |
| 10 |
|
| 11 |
|
| 12 |
Modified: main/trunk/pym/portage/__init__.py |
| 13 |
=================================================================== |
| 14 |
--- main/trunk/pym/portage/__init__.py 2009-01-21 22:49:42 UTC (rev 12543) |
| 15 |
+++ main/trunk/pym/portage/__init__.py 2009-01-22 00:43:44 UTC (rev 12544) |
| 16 |
@@ -252,12 +252,15 @@ |
| 17 |
ret_list = [] |
| 18 |
ret_ftype = [] |
| 19 |
for x in range(0, len(list)): |
| 20 |
- if(ignorecvs and (len(list[x]) > 2) and (list[x][:2]!=".#")): |
| 21 |
+ if list[x] in ignorelist: |
| 22 |
+ pass |
| 23 |
+ elif ignorecvs: |
| 24 |
+ if list[x][:2] != ".#": |
| 25 |
+ ret_list.append(list[x]) |
| 26 |
+ ret_ftype.append(ftype[x]) |
| 27 |
+ else: |
| 28 |
ret_list.append(list[x]) |
| 29 |
ret_ftype.append(ftype[x]) |
| 30 |
- elif (list[x] not in ignorelist): |
| 31 |
- ret_list.append(list[x]) |
| 32 |
- ret_ftype.append(ftype[x]) |
| 33 |
|
| 34 |
writemsg("cacheddirStats: H:%d/M:%d/S:%d\n" % (cacheHit, cacheMiss, cacheStale),10) |
| 35 |
return ret_list, ret_ftype |
Archives