Changing license header, again!
http://anonscm.debian.org/cgit/collab-maint/devscripts.git/tree/scripts/licensecheck.pl
has a very strict way to guess the Apache license and commit
8e594074929871a9761d27e814541bc0d7d84744 broke the parsing, resulting that
licensecheck.pl didn't detect the files as Apache anymore. This inhibits rolling
the client in chromium's src.git so it has to be fixed.
Ran:
git sed 's/by the Apache v2.0 license that can be/under the Apache License, Version 2.0/'
git sed 's/found in the LICENSE file/that can be found in the LICENSE file/'
git checkout HEAD -- $(git status -sb | grep '^ T' | cut -c 4-)
git checkout origin/master -- $(git diff origin/master --name-only | grep third_party)
git checkout origin/master -- appengine/isolate/doc/client/Design.md
then manually edited PRESUBMIT.py.
R=vadimsh@chromium.org
BUG=
Review-Url: https://codereview.chromium.org/2013943002
NOKEYCHECK=True
GitOrigin-RevId: 33b0f6e1d3832c95f023ea9fa1da55ca8c9cc735
diff --git a/__init__.py b/__init__.py
index 5257377..5c8814d 100644
--- a/__init__.py
+++ b/__init__.py
@@ -1,3 +1,3 @@
# Copyright 2016 The LUCI Authors. All rights reserved.
-# Use of this source code is governed by the Apache v2.0 license that can be
-# found in the LICENSE file.
+# Use of this source code is governed under the Apache License, Version 2.0
+# that can be found in the LICENSE file.
diff --git a/bootstrap.py b/bootstrap.py
index 980368b..f5aec6b 100644
--- a/bootstrap.py
+++ b/bootstrap.py
@@ -1,6 +1,6 @@
# Copyright 2016 The LUCI Authors. All rights reserved.
-# Use of this source code is governed by the Apache v2.0 license that can be
-# found in the LICENSE file.
+# Use of this source code is governed under the Apache License, Version 2.0
+# that can be found in the LICENSE file.
import collections
import os
diff --git a/stream.py b/stream.py
index 6221165..c34f8fa 100644
--- a/stream.py
+++ b/stream.py
@@ -1,6 +1,6 @@
# Copyright 2016 The LUCI Authors. All rights reserved.
-# Use of this source code is governed by the Apache v2.0 license that can be
-# found in the LICENSE file.
+# Use of this source code is governed under the Apache License, Version 2.0
+# that can be found in the LICENSE file.
import collections
import contextlib
diff --git a/streamname.py b/streamname.py
index 516226b..3b92fa7 100644
--- a/streamname.py
+++ b/streamname.py
@@ -1,6 +1,6 @@
# Copyright 2016 The LUCI Authors. All rights reserved.
-# Use of this source code is governed by the Apache v2.0 license that can be
-# found in the LICENSE file.
+# Use of this source code is governed under the Apache License, Version 2.0
+# that can be found in the LICENSE file.
import re
import types
diff --git a/tests/bootstrap_test.py b/tests/bootstrap_test.py
index a676546..c4ffe20 100755
--- a/tests/bootstrap_test.py
+++ b/tests/bootstrap_test.py
@@ -1,7 +1,7 @@
#!/usr/bin/env python
# Copyright 2016 The LUCI Authors. All rights reserved.
-# Use of this source code is governed by the Apache v2.0 license that can be
-# found in the LICENSE file.
+# Use of this source code is governed under the Apache License, Version 2.0
+# that can be found in the LICENSE file.
import os
import sys
diff --git a/tests/stream_test.py b/tests/stream_test.py
index b308f2e..37fe01b 100755
--- a/tests/stream_test.py
+++ b/tests/stream_test.py
@@ -1,7 +1,7 @@
#!/usr/bin/env python
# Copyright 2016 The LUCI Authors. All rights reserved.
-# Use of this source code is governed by the Apache v2.0 license that can be
-# found in the LICENSE file.
+# Use of this source code is governed under the Apache License, Version 2.0
+# that can be found in the LICENSE file.
import json
import os
diff --git a/tests/streamname_test.py b/tests/streamname_test.py
index 92c91a4..408ee75 100755
--- a/tests/streamname_test.py
+++ b/tests/streamname_test.py
@@ -1,7 +1,7 @@
#!/usr/bin/env python
# Copyright 2016 The LUCI Authors. All rights reserved.
-# Use of this source code is governed by the Apache v2.0 license that can be
-# found in the LICENSE file.
+# Use of this source code is governed under the Apache License, Version 2.0
+# that can be found in the LICENSE file.
import os
import sys
diff --git a/tests/varint_test.py b/tests/varint_test.py
index 0e80ddd..eb53fd1 100755
--- a/tests/varint_test.py
+++ b/tests/varint_test.py
@@ -1,7 +1,7 @@
#!/usr/bin/env python
# Copyright 2016 The LUCI Authors. All rights reserved.
-# Use of this source code is governed by the Apache v2.0 license that can be
-# found in the LICENSE file.
+# Use of this source code is governed under the Apache License, Version 2.0
+# that can be found in the LICENSE file.
import itertools
import os
diff --git a/varint.py b/varint.py
index 518dafd..7bf3cca 100644
--- a/varint.py
+++ b/varint.py
@@ -1,6 +1,6 @@
# Copyright 2016 The LUCI Authors. All rights reserved.
-# Use of this source code is governed by the Apache v2.0 license that can be
-# found in the LICENSE file.
+# Use of this source code is governed under the Apache License, Version 2.0
+# that can be found in the LICENSE file.
import os
import sys
