aboutsummaryrefslogtreecommitdiffstats
path: root/python/tidy/servo_tidy/tidy.py
diff options
context:
space:
mode:
authorAlan Jeffrey <ajeffrey@mozilla.com>2016-07-14 11:24:29 -0500
committerAlan Jeffrey <ajeffrey@mozilla.com>2016-07-14 11:24:29 -0500
commit9fa54af34794df663d02634860b8a6586f47f81b (patch)
treeffaa63d74fb688e69217ad1992e14c6b8357ef6a /python/tidy/servo_tidy/tidy.py
parent62e95c5a6192df4ecc8fd17a25200bb2188795d5 (diff)
downloadservo-9fa54af34794df663d02634860b8a6586f47f81b.tar.gz
servo-9fa54af34794df663d02634860b8a6586f47f81b.zip
Allow MIT/Apache-2.0 license as well as MPL-2.0.
Diffstat (limited to 'python/tidy/servo_tidy/tidy.py')
-rw-r--r--python/tidy/servo_tidy/tidy.py11
1 files changed, 6 insertions, 5 deletions
diff --git a/python/tidy/servo_tidy/tidy.py b/python/tidy/servo_tidy/tidy.py
index 23140de9987..fc52fbedd82 100644
--- a/python/tidy/servo_tidy/tidy.py
+++ b/python/tidy/servo_tidy/tidy.py
@@ -17,7 +17,7 @@ import site
import StringIO
import subprocess
import sys
-from licenseck import licenses
+from licenseck import licenses, licenses_toml
# License and header checks
EMACS_HEADER = "/* -*- Mode:"
@@ -295,13 +295,14 @@ duplicate versions for package "{package}"
def check_toml(file_name, lines):
if not file_name.endswith(".toml"):
raise StopIteration
- mpl_licensed = False
+ ok_licensed = False
for idx, line in enumerate(lines):
if line.find("*") != -1:
yield (idx + 1, "found asterisk instead of minimum version number")
- mpl_licensed |= ('license = "MPL-2.0"' in line)
- if not mpl_licensed:
- yield (0, ".toml file should contain MPL-2.0 license.")
+ for license in licenses_toml:
+ ok_licensed |= (license in line)
+ if not ok_licensed:
+ yield (0, ".toml file should contain a valid license.")
def check_rust(file_name, lines):