Fix tools/licenses.py to better prune directories that are empty except for VCS metadata.

tools/licenses.py

 #!/usr/bin/env python
 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Utility for checking and processing licensing information in third_party
 directories.
 
 Usage: licenses.py <command>
 
@@ skipping 53 matching lines @@
     os.path.join('third_party', 'psutils'),
     os.path.join('third_party', 'sawbuck'),
 
     # Redistribution does not require attribution in documentation.
     os.path.join('third_party','directxsdk'),
     os.path.join('third_party','platformsdk_win2008_6_1'),
     os.path.join('third_party','platformsdk_win7'),
 ])
 
 # 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'),
     os.path.join('chrome', 'common', 'extensions', 'docs', 'examples'),
     os.path.join('chrome', 'test', 'chromeos', 'autotest'),
     os.path.join('chrome', 'test', 'data'),
     os.path.join('googleurl'),
     os.path.join('native_client'),
     os.path.join('native_client_sdk'),
     os.path.join('net', 'tools', 'spdyshark'),
@@ skipping 234 matching lines @@
             metadata["Required Text"] = required_path
         else:
             raise LicenseError("Required text file listed but not found.")
 
     return metadata
 
 
 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)

[Nico, 2013/05/14 03:06:15]

Huh, I didn't know this works!

(I checked the docs, they say it does.)

     return False
 
 
 def FilterDirsWithFiles(dirs_list, root):
     # If a directory contains no files, assume it's a DEPS directory for a
     # project not used by our current configuration and skip it.
     return [x for x in dirs_list if ContainsFiles(x, root)]
 
 
 def FindThirdPartyDirs(prune_paths, root):
@@ skipping 125 matching lines @@
     elif command == 'credits':
         if not GenerateCredits():
             return 1
     else:
         print __doc__
         return 1
 
 
 if __name__ == '__main__':
   sys.exit(main())