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/update.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/update.py')
| -rw-r--r-- | pym/portage/update.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/pym/portage/update.py b/pym/portage/update.py index cbb154041..62dbf93f0 100644 --- a/pym/portage/update.py +++ b/pym/portage/update.py @@ -1,4 +1,4 @@ -# Copyright 1999-2009 Gentoo Foundation +# Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 import codecs @@ -17,6 +17,7 @@ portage.proxy.lazyimport.lazyimport(globals(), 'remove_slot', 'portage.util:ConfigProtect,grabfile,new_protect_filename,' + \ 'normalize_path,write_atomic,writemsg', + 'portage.util.listdir:_ignorecvs_dirs', 'portage.versions:ververify' ) @@ -227,7 +228,7 @@ def update_config_files(config_root, protect, protect_mask, update_iter, match_c except UnicodeDecodeError: dirs.remove(y_enc) continue - if y.startswith("."): + if y.startswith(".") or y in _ignorecvs_dirs: dirs.remove(y_enc) for y in files: try: |