diff options
| author | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-23 19:02:00 +0000 |
|---|---|---|
| committer | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-23 19:02:00 +0000 |
| commit | 959708c6f41ec074586e01e7435273f62cf6da95 (patch) | |
| tree | 0032ec6bf17884faad9d67d33ebda718ad850ae4 /tools/checklicenses | |
| parent | aaaee3541ebdbdb25a36f83a9acb2ec996ea4285 (diff) | |
| download | chromium_src-959708c6f41ec074586e01e7435273f62cf6da95.zip chromium_src-959708c6f41ec074586e01e7435273f62cf6da95.tar.gz chromium_src-959708c6f41ec074586e01e7435273f62cf6da95.tar.bz2 | |
Update licensecheck to version 2.12.4.
BUG=none
TEST=none
Review URL: https://codereview.chromium.org/11029052
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@163628 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'tools/checklicenses')
| -rwxr-xr-x | tools/checklicenses/checklicenses.py | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/tools/checklicenses/checklicenses.py b/tools/checklicenses/checklicenses.py index 480ef71..c51b078 100755 --- a/tools/checklicenses/checklicenses.py +++ b/tools/checklicenses/checklicenses.py @@ -50,8 +50,6 @@ WHITELISTED_LICENSES = [ 'BSD-like MIT/X11 (BSD like)', 'BSL (v1.0)', - # TODO(phajdan.jr): Make licensecheck not print the comma after 3.1. - 'BSL (v1.0) GPL (v3.1,)', 'GPL (v2 or later) with Bison parser exception', 'GPL (v2 or later) with libtool exception', 'GPL (v3 or later) with Bison parser exception', @@ -80,6 +78,10 @@ WHITELISTED_LICENSES = [ 'MIT/X11 (BSD like)', 'Ms-PL', 'Public domain', + 'Public domain BSD', + 'Public domain BSD (3 clause)', + 'Public domain BSD-like', + 'Public domain LGPL (v2.1 or later)', 'libpng', 'zlib/libpng', 'SGI Free Software License B', @@ -131,18 +133,12 @@ PATH_SPECIFIC_WHITELISTED_LICENSES = { 'BSD (2 clause) GPL (v2 or later)', 'BSD (3 clause) GPL (v2 or later)', 'BSL (v1.0) GPL', + 'BSL (v1.0) GPL (v3.1)', 'GPL', 'GPL (unversioned/unknown version)', 'GPL (v2)', - - # TODO(phajdan.jr): Make licensecheck not print the comma after v2. - 'GPL (v2,)', - 'GPL (v2 or later)', - - # TODO(phajdan.jr): Make licensecheck not print the comma after 3.1. - 'GPL (v3.1,)', - + 'GPL (v3.1)', 'GPL (v3 or later)', ], 'net/tools/spdyshark': [ @@ -226,6 +222,9 @@ PATH_SPECIFIC_WHITELISTED_LICENSES = { 'third_party/hunspell': [ # http://crbug.com/98134 'UNKNOWN', ], + 'third_party/hyphen/hyphen.tex': [ # http://crbug.com/157375 + 'UNKNOWN', + ], 'third_party/iccjpeg': [ # http://crbug.com/98137 'UNKNOWN', ], @@ -315,7 +314,7 @@ PATH_SPECIFIC_WHITELISTED_LICENSES = { 'third_party/ots/tools/ttf-checksum.py': [ # http://code.google.com/p/ots/issues/detail?id=2 'UNKNOWN', ], - 'third_party/molokocacao/NSBezierPath+MCAdditions.h': [ # http://crbug.com/98453 + 'third_party/molokocacao': [ # http://crbug.com/98453 'UNKNOWN', ], 'third_party/npapi/npspy': [ |