From fed50cca1e86f6e89a16eddcb24eac14c265fe47 Mon Sep 17 00:00:00 2001 From: Ms2ger Date: Fri, 11 Jul 2014 12:55:53 +0200 Subject: [PATCH] Correct the allowed MPL licenses in licenseck. --- src/etc/licenseck.py | 18 ++++++------------ src/test/wpt/run.py | 4 ++-- 2 files changed, 8 insertions(+), 14 deletions(-) diff --git a/src/etc/licenseck.py b/src/etc/licenseck.py index 017fb3f24bd..af7ecae9dc7 100644 --- a/src/etc/licenseck.py +++ b/src/etc/licenseck.py @@ -14,24 +14,18 @@ license0="""\ """ license1="""\ -/* This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this file, - * You can obtain one at http://mozilla.org/MPL/2.0/. */ +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. """ license2="""\ -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this file, -# You can obtain one at http://mozilla.org/MPL/2.0/. -""" - -license3="""\ // This Source Code Form is subject to the terms of the Mozilla Public // License, v. 2.0. If a copy of the MPL was not distributed with this // file, You can obtain one at http://mozilla.org/MPL/2.0/. """ -license4 = """\ +license3 = """\ // Copyright 2013 The Servo Project Developers. See the COPYRIGHT // file at the top-level directory of this distribution. // @@ -42,7 +36,7 @@ license4 = """\ // except according to those terms. """ -license5 = """\ +license4 = """\ # Copyright 2013 The Servo Project Developers. See the COPYRIGHT # file at the top-level directory of this distribution. # @@ -53,7 +47,7 @@ license5 = """\ # except according to those terms. """ -licenses = [license0, license1, license2, license3, license4, license5] +licenses = [license0, license1, license2, license3, license4] exceptions = [ "rust-http-client/http_parser.c", # BSD, Joyent diff --git a/src/test/wpt/run.py b/src/test/wpt/run.py index 8b7ff7d7104..661fc9dd32c 100644 --- a/src/test/wpt/run.py +++ b/src/test/wpt/run.py @@ -1,6 +1,6 @@ # This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this file, -# You can obtain one at http://mozilla.org/MPL/2.0/. +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. import sys, os, argparse