diff options
| author | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-14 23:17:05 +0000 |
|---|---|---|
| committer | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-14 23:17:05 +0000 |
| commit | d065fb78b3849a18291cc377203c5856d8d3a90e (patch) | |
| tree | 7d4b4bbbdffe34665e26b867ab694f7aa3cbc209 /tools/licenses.py | |
| parent | 1c12c06d2e1c6f845bda544afb82319537b5ec36 (diff) | |
| download | chromium_src-d065fb78b3849a18291cc377203c5856d8d3a90e.zip chromium_src-d065fb78b3849a18291cc377203c5856d8d3a90e.tar.gz chromium_src-d065fb78b3849a18291cc377203c5856d8d3a90e.tar.bz2 | |
Fix tools/licenses.py to better prune directories that are empty except for VCS metadata.
Review URL: https://chromiumcodereview.appspot.com/14949016
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@200102 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'tools/licenses.py')
| -rwxr-xr-x | tools/licenses.py | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/tools/licenses.py b/tools/licenses.py index 362ca62..4b4a400 100755 --- a/tools/licenses.py +++ b/tools/licenses.py @@ -71,9 +71,10 @@ PRUNE_PATHS = set([ ]) # Directories we don't scan through. -PRUNE_DIRS = ('.svn', '.git', # VCS metadata - 'out', 'Debug', 'Release', # build files - 'layout_tests') # lots of subdirs +VCS_METADATA_DIRS = ('.svn', '.git') +PRUNE_DIRS = (VCS_METADATA_DIRS + + ('out', 'Debug', 'Release', # build files + 'layout_tests')) # lots of subdirs ADDITIONAL_PATHS = ( os.path.join('breakpad'), @@ -328,9 +329,12 @@ def ParseDir(path, root, require_license_file=True): def ContainsFiles(path, root): """Determines whether any files exist in a directory or in any of its subdirectories.""" - for _, _, files in os.walk(os.path.join(root, path)): + for _, dirs, files in os.walk(os.path.join(root, path)): if files: return True + for vcs_metadata in VCS_METADATA_DIRS: + if vcs_metadata in dirs: + dirs.remove(vcs_metadata) return False |