diff options
| author | Zac Medico <zmedico@gentoo.org> | 2010-08-23 00:23:15 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2010-08-23 00:23:15 -0700 |
| commit | d352f409a7178f36c77cf5c47b7783f22a00486a (patch) | |
| tree | ce0d92e429a45678fefa4640074b90f425bfcd29 /pym/portage/util/__init__.py | |
| parent | 9e65223cc5fe2418e349bb37da9cc2103f021409 (diff) | |
| download | portage-d352f409a7178f36c77cf5c47b7783f22a00486a.tar.gz portage-d352f409a7178f36c77cf5c47b7783f22a00486a.tar.bz2 portage-d352f409a7178f36c77cf5c47b7783f22a00486a.zip | |
Make recursive grablines() ignore the same directories as
portage.listdir(), and do the same for update_config_files().
Diffstat (limited to 'pym/portage/util/__init__.py')
| -rw-r--r-- | pym/portage/util/__init__.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/pym/portage/util/__init__.py b/pym/portage/util/__init__.py index b5ae524b0..279a12137 100644 --- a/pym/portage/util/__init__.py +++ b/pym/portage/util/__init__.py @@ -1,4 +1,4 @@ -# Copyright 2004-2009 Gentoo Foundation +# Copyright 2004-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 __all__ = ['apply_permissions', 'apply_recursive_permissions', @@ -23,6 +23,9 @@ import sys import traceback import portage +portage.proxy.lazyimport.lazyimport(globals(), + 'portage.util.listdir:_ignorecvs_dirs' +) from portage import StringIO from portage import os from portage import pickle @@ -328,7 +331,7 @@ def grabfile_package(myfilename, compatlevel=0, recursive=0, allow_wildcard=Fals def grablines(myfilename,recursive=0): mylines=[] if recursive and os.path.isdir(myfilename): - if os.path.basename(myfilename) in ["RCS", "CVS", "SCCS"]: + if os.path.basename(myfilename) in _ignorecvs_dirs: return mylines dirlist = os.listdir(myfilename) dirlist.sort() |