diff options
| author | fischman@chromium.org <fischman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-29 09:07:47 +0000 |
|---|---|---|
| committer | fischman@chromium.org <fischman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-29 09:07:47 +0000 |
| commit | cfeded013c4f6d9b6f6d8bd42fd1cd3c8c399e3d (patch) | |
| tree | b32175e2ba26ca17f7bc5ef5f2091ec9ad1a43b3 /third_party/devscripts | |
| parent | 7bddc7e76b225ea76e617faa3252f26a7222902b (diff) | |
| download | chromium_src-cfeded013c4f6d9b6f6d8bd42fd1cd3c8c399e3d.zip chromium_src-cfeded013c4f6d9b6f6d8bd42fd1cd3c8c399e3d.tar.gz chromium_src-cfeded013c4f6d9b6f6d8bd42fd1cd3c8c399e3d.tar.bz2 | |
Teach licensecheck.pl about a variant of BSD in libva.
See https://bugs.freedesktop.org/show_bug.cgi?id=49588 for context
BUG=126466
Review URL: https://chromiumcodereview.appspot.com/10692028
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@144892 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/devscripts')
| -rwxr-xr-x | third_party/devscripts/licensecheck.pl | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/third_party/devscripts/licensecheck.pl b/third_party/devscripts/licensecheck.pl index 433807e..4e75716 100755 --- a/third_party/devscripts/licensecheck.pl +++ b/third_party/devscripts/licensecheck.pl @@ -438,7 +438,8 @@ sub parselicense($) { $license = "ISC $license"; } - if ($licensetext =~ /THIS SOFTWARE IS PROVIDED .*AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY/) { + if ($licensetext =~ /THIS SOFTWARE IS PROVIDED .*AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY/ || + $licensetext =~ /THE SOFTWARE IS PROVIDED AS IS, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABIL- ITY/) { if ($licensetext =~ /All advertising materials mentioning features or use of this software must display the following/) { $license = "BSD (4 clause) $license"; } elsif ($licensetext =~ /be used to endorse or promote products derived from this software/) { |