diff options
| author | Zac Medico <zmedico@gentoo.org> | 2009-03-11 03:21:20 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2009-03-11 03:21:20 +0000 |
| commit | b26852ce621d0eb7fa01f0fc6f880b99f7ff1aee (patch) | |
| tree | 4cec87524679fa4ae219a0ff1bd24576b7527c22 /pym | |
| parent | bbef438d87306f926fdbb4b62f2a120f58d47839 (diff) | |
| download | portage-b26852ce621d0eb7fa01f0fc6f880b99f7ff1aee.tar.gz portage-b26852ce621d0eb7fa01f0fc6f880b99f7ff1aee.tar.bz2 portage-b26852ce621d0eb7fa01f0fc6f880b99f7ff1aee.zip | |
Make listdir(ignorecvs=True) ignore .git directories. Thanks to Christian
Ruppert for the suggestion. (trunk r12545)
svn path=/main/branches/2.1.6/; revision=12831
Diffstat (limited to 'pym')
| -rw-r--r-- | pym/portage/__init__.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py index a468146ca..406f15d27 100644 --- a/pym/portage/__init__.py +++ b/pym/portage/__init__.py @@ -265,6 +265,8 @@ def cacheddir(my_original_path, ignorecvs, ignorelist, EmptyOnError, followSymli writemsg("cacheddirStats: H:%d/M:%d/S:%d\n" % (cacheHit, cacheMiss, cacheStale),10) return ret_list, ret_ftype +_ignorecvs_dirs = ('CVS', 'SCCS', '.svn', '.git') + def listdir(mypath, recursive=False, filesonly=False, ignorecvs=False, ignorelist=[], followSymlinks=True, EmptyOnError=False, dirsonly=False): """ @@ -276,7 +278,7 @@ def listdir(mypath, recursive=False, filesonly=False, ignorecvs=False, ignorelis @type recursive: Boolean @param filesonly; Only return files, not more directories @type filesonly: Boolean - @param ignorecvs: Ignore CVS directories ('CVS','.svn','SCCS') + @param ignorecvs: Ignore CVS directories ('CVS','SCCS','.svn','.git') @type ignorecvs: Boolean @param ignorelist: List of filenames/directories to exclude @type ignorelist: List @@ -303,7 +305,8 @@ def listdir(mypath, recursive=False, filesonly=False, ignorecvs=False, ignorelis if recursive: x=0 while x<len(ftype): - if ftype[x]==1 and not (ignorecvs and os.path.basename(list[x]) in ('CVS','.svn','SCCS')): + if ftype[x] == 1 and not \ + (ignorecvs and os.path.basename(list[x]) in _ignorecvs_dirs): l,f = cacheddir(mypath+"/"+list[x], ignorecvs, ignorelist, EmptyOnError, followSymlinks) |