diff options
| author | bulach@chromium.org <bulach@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-13 18:38:11 +0000 |
|---|---|---|
| committer | bulach@chromium.org <bulach@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-13 18:38:11 +0000 |
| commit | 76297d2792b44dc5e0b2f5fad488acf815f7813f (patch) | |
| tree | cbadbeeff4922c5d282f8aa21901471c52a0ee03 /tools/checklicenses | |
| parent | 84973c7fadd7ada568f781fc35caed1693addf65 (diff) | |
| download | chromium_src-76297d2792b44dc5e0b2f5fad488acf815f7813f.zip chromium_src-76297d2792b44dc5e0b2f5fad488acf815f7813f.tar.gz chromium_src-76297d2792b44dc5e0b2f5fad488acf815f7813f.tar.bz2 | |
Fixes checklicenses following r167398
After r167398, checklicenses expanded its context to 100 lines,
and it now detects a few more licenses than before.
Add the new files to the whitelist.
BUG=
TEST=checklicenses step is green
Review URL: https://codereview.chromium.org/11312212
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@167430 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'tools/checklicenses')
| -rwxr-xr-x | tools/checklicenses/checklicenses.py | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/tools/checklicenses/checklicenses.py b/tools/checklicenses/checklicenses.py index 63f4e7d..abb8de1 100755 --- a/tools/checklicenses/checklicenses.py +++ b/tools/checklicenses/checklicenses.py @@ -41,6 +41,7 @@ WHITELISTED_LICENSES = [ 'BSD (2 clause) MIT/X11 (BSD like)', 'BSD (3 clause)', 'BSD (3 clause) ISC', + 'BSD (3 clause) LGPL (v2 or later)', 'BSD (3 clause) LGPL (v2.1 or later)', 'BSD (3 clause) MIT/X11 (BSD like)', 'BSD (4 clause)', @@ -69,6 +70,8 @@ WHITELISTED_LICENSES = [ 'MPL (v1.1)', 'MPL (v1.1) BSD-like', 'MPL (v1.1) BSD-like GPL (unversioned/unknown version)', + 'MPL (v1.1,) BSD (3 clause) GPL (unversioned/unknown version) ' + 'LGPL (v2.1 or later)', 'MPL (v1.1) GPL (unversioned/unknown version)', # TODO(phajdan.jr): Make licensecheck not print the comma after 1.1. @@ -166,6 +169,10 @@ PATH_SPECIFIC_WHITELISTED_LICENSES = { 'third_party/WebKit': [ 'UNKNOWN', ], + 'third_party/WebKit/Websites/webkit.org/blog/wp-content/plugins/' + 'akismet/akismet.php': [ + 'GPL (v2 or later)' + ], 'third_party/WebKit/Source/JavaScriptCore/tests/mozilla': [ 'GPL', 'GPL (v2 or later)', @@ -303,6 +310,7 @@ PATH_SPECIFIC_WHITELISTED_LICENSES = { 'third_party/mesa/MesaLib': [ 'GPL (v2)', 'GPL (v3 or later)', + 'MIT/X11 (BSD like) GPL (v3 or later) with Bison parser exception', 'UNKNOWN', # http://crbug.com/98450 ], 'third_party/modp_b64': [ |