| 1 |
Author: zmedico |
| 2 |
Date: 2009-01-22 00:51:19 +0000 (Thu, 22 Jan 2009) |
| 3 |
New Revision: 12545 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/trunk/pym/portage/__init__.py |
| 7 |
Log: |
| 8 |
Make listdir(ignorecvs=True) ignore .git directories. Thanks to Christian |
| 9 |
Ruppert for the suggestion. |
| 10 |
|
| 11 |
|
| 12 |
Modified: main/trunk/pym/portage/__init__.py |
| 13 |
=================================================================== |
| 14 |
--- main/trunk/pym/portage/__init__.py 2009-01-22 00:43:44 UTC (rev 12544) |
| 15 |
+++ main/trunk/pym/portage/__init__.py 2009-01-22 00:51:19 UTC (rev 12545) |
| 16 |
@@ -265,6 +265,8 @@ |
| 17 |
writemsg("cacheddirStats: H:%d/M:%d/S:%d\n" % (cacheHit, cacheMiss, cacheStale),10) |
| 18 |
return ret_list, ret_ftype |
| 19 |
|
| 20 |
+_ignorecvs_dirs = ('CVS', 'SCCS', '.svn', '.git') |
| 21 |
+ |
| 22 |
def listdir(mypath, recursive=False, filesonly=False, ignorecvs=False, ignorelist=[], followSymlinks=True, |
| 23 |
EmptyOnError=False, dirsonly=False): |
| 24 |
""" |
| 25 |
@@ -276,7 +278,7 @@ |
| 26 |
@type recursive: Boolean |
| 27 |
@param filesonly; Only return files, not more directories |
| 28 |
@type filesonly: Boolean |
| 29 |
- @param ignorecvs: Ignore CVS directories ('CVS','.svn','SCCS') |
| 30 |
+ @param ignorecvs: Ignore CVS directories ('CVS','SCCS','.svn','.git') |
| 31 |
@type ignorecvs: Boolean |
| 32 |
@param ignorelist: List of filenames/directories to exclude |
| 33 |
@type ignorelist: List |
| 34 |
@@ -303,7 +305,8 @@ |
| 35 |
if recursive: |
| 36 |
x=0 |
| 37 |
while x<len(ftype): |
| 38 |
- if ftype[x]==1 and not (ignorecvs and os.path.basename(list[x]) in ('CVS','.svn','SCCS')): |
| 39 |
+ if ftype[x] == 1 and not \ |
| 40 |
+ (ignorecvs and os.path.basename(list[x]) in _ignorecvs_dirs): |
| 41 |
l,f = cacheddir(mypath+"/"+list[x], ignorecvs, ignorelist, EmptyOnError, |
| 42 |
followSymlinks) |
Archives