diff options
| author | Thomas Holder <thomas@thomas-holder.de> | 2018-11-10 11:09:40 +0000 |
|---|---|---|
| committer | Thomas Holder <thomas@thomas-holder.de> | 2018-11-10 11:09:40 +0000 |
| commit | c56fbded2529d4532ad8d9294fc0755e325ed0ae (patch) | |
| tree | b80415e2695a59e9e2e9ae8686a828d33aec0a96 /buildtools | |
| parent | check-license-headers Python 2 compatible (diff) | |
| download | inkscape-c56fbded2529d4532ad8d9294fc0755e325ed0ae.tar.gz inkscape-c56fbded2529d4532ad8d9294fc0755e325ed0ae.zip | |
license check: split " OR "
Diffstat (limited to 'buildtools')
| -rwxr-xr-x | buildtools/check_license_headers.py | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/buildtools/check_license_headers.py b/buildtools/check_license_headers.py index c7cb3d9f7..b7a6fcb17 100755 --- a/buildtools/check_license_headers.py +++ b/buildtools/check_license_headers.py @@ -68,8 +68,6 @@ IGNORE_FILE_ENDINGS = [ # IF YOU CHANGE THIS, also update the list of licenses in COPYING! PERMITTED_LICENSES = [ "GPL-2.0-or-later", - "GPL-2.0-or-later OR MPL-1.1 OR LGPL-2.1-or-later", - "GPL-3.0-or-later", "GPL-3.0-or-later", "LGPL-2.1-or-later", "LGPL-3.0-or-later", @@ -122,7 +120,7 @@ def main(filenames): print("This is required so that we can make sure all files have compatible licenses.", file=sys.stderr) print("If you think this message is wrong, edit buildtools/check_license_header.py", file=sys.stderr) sys.exit(1) - if not license[p] in PERMITTED_LICENSES: + if not any(lic in PERMITTED_LICENSES for lic in license[p].split(' OR ')): print("File '{}' has an incompatible or unknown license '{}' in the SPDX-License-Identifier header.".format(p, license[p]), file=sys.stderr) print("Allowed licenses are: ", file=sys.stderr) print("\n".join(PERMITTED_LICENSES), file=sys.stderr) |