Make it easier to remove path-specific whitelist entries

tools/checklicenses/checklicenses.py

 #!/usr/bin/python
 # Copyright (c) 2011 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.
 
 """Makes sure that all files contain proper licensing information."""
 
 
 import optparse
 import os.path
 import subprocess
 import sys
 
 
 def PrintUsage():
   print """Usage: python checklicenses.py [--root <root>] [tocheck]
   --root   Specifies the repository root. This defaults to "../.." relative
            to the script file. This will be correct given the normal location
            of the script in "<root>/tools/checklicenses".
 
+  --ignore-suppressions  Ignores path-specific license whitelist. Useful when
+                         trying to remove a suppression/whitelist entry.
+
   tocheck  Specifies the directory, relative to root, to check. This defaults
            to "." so it checks everything.
 
 Examples:
   python checklicenses.py
   python checklicenses.py --root ~/chromium/src third_party"""
 
 
 WHITELISTED_LICENSES = [
     'Apache (v2.0)',
@@ skipping 456 matching lines @@
     # For now we're just interested in the license.
     license = license.replace('*No copyright*', '').strip()
 
     # Skip generated files.
     if 'GENERATED FILE' in license:
       continue
 
     if license in WHITELISTED_LICENSES:
       continue
 
-    found_path_specific = False
-    for prefix in PATH_SPECIFIC_WHITELISTED_LICENSES:
-      if (filename.startswith(prefix) and
-          license in PATH_SPECIFIC_WHITELISTED_LICENSES[prefix]):
+    if not options.ignore_suppressions:
+      found_path_specific = False
+      for prefix in PATH_SPECIFIC_WHITELISTED_LICENSES:
+        if (filename.startswith(prefix) and
+            license in PATH_SPECIFIC_WHITELISTED_LICENSES[prefix]):
           found_path_specific = True
           break
-    if found_path_specific:
-      continue
+      if found_path_specific:
+        continue
 
     print "'%s' has non-whitelisted license '%s'" % (filename, license)
     success = False
 
   if success:
     print "\nSUCCESS\n"
     sys.exit(0)
   else:
     print "\nFAILED\n"
     print "Please read",
@@ skipping 10 matching lines @@
   default_root = os.path.abspath(
       os.path.join(os.path.dirname(__file__), '..', '..'))
   option_parser = optparse.OptionParser()
   option_parser.add_option('--root', default=default_root,
                            dest='base_directory',
                            help='Specifies the repository root. This defaults '
                            'to "../.." relative to the script file, which '
                            'will normally be the repository root.')
   option_parser.add_option('-v', '--verbose', action='store_true',
                            default=False, help='Print debug logging')
+  option_parser.add_option('--ignore-suppressions',
+                           action='store_true',
+                           default=False,
+                           help='Ignore path-specific license whitelist.')
   options, args = option_parser.parse_args()
   main(options, args)