aboutsummaryrefslogtreecommitdiffstats
path: root/python/tidy/servo_tidy/tidy.py
diff options
context:
space:
mode:
authorJan Andre Ikenmeyer <jan@ikenmeyer.eu>2018-11-19 14:46:20 +0100
committerJan Andre Ikenmeyer <jan@ikenmeyer.eu>2018-11-19 14:46:20 +0100
commit12c0d1350ada99201f5c55afb04d9a7d40b75aa7 (patch)
treedeaa1bcbf07f7c285cc672a241d12fe8c5759b36 /python/tidy/servo_tidy/tidy.py
parent1ac6f435c8637d01279b51fecb535a19b639aea5 (diff)
downloadservo-12c0d1350ada99201f5c55afb04d9a7d40b75aa7.tar.gz
servo-12c0d1350ada99201f5c55afb04d9a7d40b75aa7.zip
servo-tidy: Allow to use MPL with http and https
Diffstat (limited to 'python/tidy/servo_tidy/tidy.py')
-rw-r--r--python/tidy/servo_tidy/tidy.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/python/tidy/servo_tidy/tidy.py b/python/tidy/servo_tidy/tidy.py
index f8def74e57c..446db50feea 100644
--- a/python/tidy/servo_tidy/tidy.py
+++ b/python/tidy/servo_tidy/tidy.py
@@ -22,7 +22,7 @@ import colorama
import toml
import voluptuous
import yaml
-from licenseck import MPL, APACHE, COPYRIGHT, licenses_toml, licenses_dep_toml
+from licenseck import OLD_MPL, MPL, APACHE, COPYRIGHT, licenses_toml, licenses_dep_toml
topdir = os.path.abspath(os.path.dirname(sys.argv[0]))
wpt = os.path.join(topdir, "tests", "wpt")
@@ -235,7 +235,7 @@ def check_license(file_name, lines):
license_block.append(line)
header = " ".join(license_block)
- valid_license = MPL in header or is_apache_licensed(header)
+ valid_license = OLD_MPL in header or MPL in header or is_apache_licensed(header)
acknowledged_bad_license = "xfail-license" in header
if not (valid_license or acknowledged_bad_license):
yield (1, "incorrect license")