Backed out 2 changesets (bug 1596911) for license failures on several files. CLOSED TREE
authorCosmin Sabou <csabou@mozilla.com>
Fri, 22 Nov 2019 21:24:25 +0200
changeset 2493346 2c912e46295e4f8a3fa5824a7f378e06760ec7dd
parent 2493345 0faa0c0addaf41997e52783ad52d527be238dbda
child 2493347 da6821fc678ebd2a108065e47c60cab1105530bb
child 2493357 9b9fef3fde4d7042d0ceb856f423a1eabeef4c91
child 2493399 de668ecfcbc7b9c7acdfdeb116b51a37bb872b3b
child 2493403 2a1463f640b9df1248c2962420d3734e05be4b18
child 2493408 ff4b127e3611f9924a54f5a45e7f00b7b7950281
child 2493414 ff08707104063dca87d7d4265454f049e5de58b6
child 2493432 f7099c2e9a9861f3d1bd3190ac6aab2ccaa713be
child 2493438 2f711b988e77d62f1399ac472b15b8586be1d246
child 2493448 c63357c6dc442614ff2067a3651fe9ed34467876
child 2493450 2aaf1c7b7f1c2e6b6b9a8ab3880fe7acacf0a3f1
child 2493509 7595ce99c25063a4b1f296e06f3afc42b0d2fbbc
child 2493513 ce485cb4b0c6ec85d607cef7316e6b2859ebfc09
child 2493537 d8659aa88b5ce7cfa3b41ccb9430899a9694c3be
child 2493543 f3214041e1c9bdee1ff9601f4cb796bd2e68e8d9
child 2493545 1a9862678930d462973e01d9c23728b49077420c
child 2493575 525162437f877a56439e2f5f682c79c02c54f945
child 2493581 902eb4ca3881f155bb292980d6a01283dcc3fb9a
child 2493584 776d449878fc2350c3d7ffd4ff48a8e2bf9e8d3e
child 2493592 53e1f4571f08ee970bdd760a21b9601f1a1a5a41
child 2493599 e81763a92f785feefe11d33718ac5d5300678177
child 2493605 df6fbf4ef58f397b10b7e989252a161c43bc9d72
child 2493616 ab251f21cc21e1bfa6a450feba56ed56efdad130
child 2493628 580e1065699118a5aa42851bad3995a7d7f80654
child 2493637 2b5855a1b92280c2d28fff3df198ed32bef1aa4a
child 2493648 d93538a76bd4e4783e242028311b0e6ea83b5ad4
child 2493652 2986d632a1e6e28aa2158233722928e45d8b8a54
child 2493663 99ec155d550c281eab39595ba6e29f4aa893a5b3
child 2493671 87fc5f215d425c0fc91eef3238fd235a74047882
child 2493681 5a7ae3f110fa41a9322764faaffa8930fc87908e
child 2493684 539593252cdff8bff9327ec0325ae8639d87ee60
child 2493690 c07c978ae172f86d2ca78b1d74f958cf980061c3
child 2493692 f412a7b7effa3fc1565c503bfc991056cfd1445c
child 2493694 2f1238ec565f19e317b5154c9598af488022e54a
child 2493697 6587b80b57d5b5b006516984170e9c71d3e79c9b
child 2493701 3f647aaa518ed5434554e66951d7c22612a34db3
child 2493739 c36514e304f924b68a1b61b43223f9506e31ec9d
child 2493740 717a0da0d6caab512e332de9a203e790b29cfd7c
child 2493744 afb487b9563ae9fa8916bacf3fca9e1eefe8ed2a
child 2493746 a02e0d31b067132a777aae8d0880b28357127667
child 2493767 42c009b8083ab58da021df9bddf8d8c91a0c3f9d
child 2493783 43d4941f161ecb4123c1392af0adef9274a3c5f5
child 2493793 ecda6ad8dd840bd525961f0ea8ec752f70aaca9c
child 2493795 5c8e3fb74c5b18fc2a967959beef9e5cc2ee7531
child 2493797 c3ff4dcc94f2072a1f85da0ac586a18516072825
child 2493800 316e24ded5fabd13536d632dd11fff952518916c
child 2493804 e3e95f95e59f197b3b6b74d5d709eebfd6b714d7
child 2493809 8ba7bfb5d65f72100f5c50bb1ae6a4c3260c796d
child 2493815 77740d5cbf3f6f7e5bb6326fd77c2e54b7d865cd
child 2493822 66f2c6bcaba4be2a578e564c4ca7b85af4b6d8ed
child 2493830 5bc6c4b5399162dcf8ffe5261b67317c33494b43
child 2493839 544ce1e5cac03751607aaa27a9d5a7bdce0aa2a1
child 2493841 e433d271cc752f731ca93c3c91afd9845f5cbeb0
child 2493843 73f4d006aa900b914e858b897a617e522afcc930
child 2493865 80b8cca0abc9d515a430e0879dccbae3e816c242
child 2493867 e0dcd18c43d8dc3c015b172493c1176753e6b137
child 2493871 bf704b17f47c7c5305901e80e5e91dc2392766e0
child 2493875 49976dac7c34a39e663e3c1575f1a47a0581937b
child 2493879 02d5d98602803d2aef57225916f31d8a192af2d9
child 2493882 a077123b3557e206e9403aa4eff719cf4c05340c
child 2493891 fd2de2832a3dd62bf022ada51f1f9658ce38389e
child 2493893 0d60ec03350ca89af3ad24348134224fe6cf9e4f
child 2493912 fcb427fc0b1442253fdb3b5584f32165d8740531
child 2493914 19f0134ad42fb4a7cb117eff218843a441c0332b
child 2494030 03937b7f1575fc35169477ce7a938e91f7948564
child 2494057 94324823e44773c0ca549cf7b0ae70bd9a28a7cb
child 2494072 7b3bf2a23ba7fce01bd791abc30f590260ba9fd7
child 2494076 e59b42de6665fe41c22e6f865a20dd35580d5738
child 2494084 ebac762651f210913393de33d93253435690e4dd
child 2494086 0c9ba6b72874da6c158efe0a728f77d6ba3bb0d4
child 2494214 e3d10e3b0428a0ef36ba194c25127f1cf227b5fe
child 2494242 563e04743b313c4cde3970092384887483751eef
child 2494244 6359169689d8626eec0fb56852920266997dc3ce
child 2494247 caa217d9abb9ded8e02d170688bd0062b12cf896
child 2494251 129f93c814c02c924e3b2e344c736807525ef54c
child 2494257 dc7dad9ed9a401c83142010e8d2f80b9a4e77119
child 2494262 ee5b6261c357dc58120f9a1dc22151540a021af2
child 2494269 601ddfd39ee570d0c8651b6e4b024dba9e824e5e
child 2494277 054df01b4282b7d94fcc6790d6746215a8829050
child 2494293 1fcdb9dc1b04e43a1b471d041b90aa96a3f1d371
child 2494295 0766d7653e8df0c128694621238a1ed2cfc6ab34
child 2494298 3472caf41f30a0f6a95fb18ba058714cc028d492
child 2494302 783f760c28c39dd37d0964568f5f1d08b8bd1059
child 2494307 cd12bb6582b150fb2a63e04d65a241e2918cc355
child 2494313 faf08690eff91bcee1ccaddb3423d688545a50fb
child 2494380 0efce5373f6f46256cc7f25286a87615c2b3125b
child 2494386 009a360922339965d74085fd6c4d5957922c239a
child 2494583 d33a33fd5ee46401693464010d73ab2895067638
child 2495935 650ff38bf1a35cccd9e267c1635cbda5a6096508
child 2496511 ad41b540c7e2617cfdc9c9c085eb2e35a1681b98
child 2496876 caf8bd68024c4aca4f13a41807038a116dc94c9a
child 2497041 d44e53ccaab95f5b4684d9009ffb29f7f8e89070
child 2497048 26f3e93c4bd73d5066d6aedce11bc18c6fede2c5
child 2497056 a2fa822617f9b92f4d584f13cffd2d19164281ec
child 2497063 ed2141abd9f2d3922347d0e0e9e67bd397eea444
child 2497846 6a2b678b40a726dac035a8adb3cd015992deaac8
child 2497905 9fff748ce7b016d5026e7e135598ec63d0c74ecf
child 2498089 c2122e27645f31ce9722cf9373919e70dae2529b
child 2498119 d5545ac8a6db7d3c16988686469759b89ee499eb
child 2498241 45deb268564cf5ff65392fca7de83951d5f54271
child 2498389 7c4e2e49426f4ef6df1100e7f9379ccb65da2f16
child 2498756 299f7cbf65d333bec8d5fd3fc15b823d6f871a9c
child 2498776 2a2505fde702777c60e5ad2f7483aa6461c8ce27
child 2500637 35a165696809ea80272267e4b12c3642edebe573
child 2501188 7b0e7f086a013d43ae2d4ce18a77ed590766a7e2
child 2501330 e2e8fdf92c808a01f879c1b2ddc284798d312b3d
child 2502282 7ab75ea83aa029141fdd5978da21c25493f898d0
child 2502284 b3b6f4b234dc3de652abec28022bea9ecece9a39
child 2503209 cac02ecc1e5bfd47722d88b5c63f97080bec54d9
child 2506747 fffbd52706a896825dec591c2dd840cd6950f2b9
child 2506790 0f4947ebc9cca94a9a13f687902ef28ca9f949aa
child 2509595 681a5407a6bb3ac933b3095f8811121176e341ee
child 2509600 272bee6c42982a7ebf74d74e4c3318c2c59af9ba
child 2513448 6f363990fc02103aeb121536f6a727103df58bba
child 2513763 53e388ea5fabe629a088e1f4b8db9704a5f898b3
child 2513767 59f1d5c5ec0de87b1aece6bc8ed808d1e1a065d6
child 2513957 bcf9e4d1fdec487c13db88725ab1096322073361
child 2513959 4e672ba937cd29b5a90c34a898612eca5b2ad4d6
child 2520203 ebee3e094b150b4786c5f28738bd7c75f85feb48
child 2520205 810033abca69713b3aedec46ab6a5e6bb8c17093
child 2638670 b2eb4fc3d2e94bb39a5e9fe604d41ecadc6ed61c
push id454438
push userreviewbot
push dateFri, 22 Nov 2019 21:49:20 +0000
treeherdertry@1b9e3d51a859 [default view] [failures only]
bugs1596911
milestone72.0a1
backs outb17ea5cb77148d291bdcb10f2d8bc598b5cd67c2
394f75b9488a77819cd2b2f381e81961435665c1
Backed out 2 changesets (bug 1596911) for license failures on several files. CLOSED TREE Backed out changeset b17ea5cb7714 (bug 1596911) Backed out changeset 394f75b9488a (bug 1596911)
tools/lint/license.yml
tools/lint/license/__init__.py
--- a/tools/lint/license.yml
+++ b/tools/lint/license.yml
@@ -3,54 +3,37 @@ license:
     description: License Check
     include:
         - .
     exclude:
         # These paths need to be triaged.
         - build/pgo/js-input
         - build/workspace-hack/src/lib.rs
         - browser/app/blocklist.xml
-        # License not super clear
-        - browser/branding/aurora/content/
-        - browser/components/newtab/css/
         - browser/components/pocket/content/panels/
         - browser/components/shell/ScreenshotChild.jsm
-        - browser/extensions/pdfjs/content/web/images/
         - browser/extensions/webcompat/about-compat/aboutCompat.html
         - browser/extensions/webcompat/injections/js
-        # Different license
-        - build/pgo/blueprint/print.css
-        # Different license
-        - build/pgo/blueprint/screen.css
         - config/external/ffi/preprocess_libffi_asm.py
         - config/external/ffi/subst_header.py
         - config/external/nspr/_pl_bld.h
         - config/external/nspr/_pr_bld.h
         - config/system_header_util.py
-        - dom/docs/Fission-IPC-Diagram.svg
         # Unknown origin
         - gfx/2d/MMIHelpers.h
         # Generated code
         - gfx/2d/ShadersD2D1.h
-        # might not work with license
-        - gradle.properties
-        # might not work with license
-        - gradle/wrapper/gradle-wrapper.properties
         - intl/l10n/L10nRegistry.jsm
         - ipc/ipdl/ipdl/cxx/code.py
         - media/libdav1d/vcs_version.h
         - media/mtransport/mdns_service/mdns_service.h
         - mobile/android/components/extensions
         - mobile/android/geckoview/src/main/AndroidManifest.xml
         - mobile/android/geckoview/src/main/res/drawable/ic_generic_file.xml
         - mobile/android/geckoview_example/src/main
-        # might not work with license
-        - mobile/android/gradle/dotgradle-offline/gradle.properties
-        # might not work with license
-        - mobile/android/gradle/dotgradle-online/gradle.properties
         # Almost empty file
         - modules/libpref/greprefs.js
         - mozglue/android/NativeCrypto.h
         - parser/html/java/named-character-references.html
         - python/mozboot/support/ConEmu.xml
         - python/mozbuild/mozbuild/action/tooltool.py
         - python/mozbuild/mozbuild/artifact_commands.py
         - python/mozbuild/mozbuild/export_telemetry_schema.py
@@ -75,29 +58,24 @@ license:
         # By design
         - tools/lint/test/
         # generated file
         - xpcom/ds/HTMLAtoms.py
     extensions:
         - .c
         - .cc
         - .cpp
-        - .css
-        - .dtd
-        - .ftl
         - .h
         - .html
         - .js
         - .jsm
         - .jsx
         - .m
         - .mm
-        - .properties
         - .py
         - .rs
-        - .svg
         - .xhtml
         - .xml
         - .xul
     support-files:
         - 'tools/lint/license/**'
     type: external
     payload: license:lint
--- a/tools/lint/license/__init__.py
+++ b/tools/lint/license/__init__.py
@@ -130,21 +130,17 @@ def fix_me(filename):
             start = "   - "
             end = ""
             if i == 0:
                 # first line, we have the <!--
                 start = "<!-- "
             if i == 2 or (i == 1 and test):
                 # Last line, we end by -->
                 end = " -->"
-            license.append(start + l.strip() + end)
-            if ext != '.svg' or end == "":
-                # When dealing with an svg, we should not have a space between
-                # the license and the content
-                license.append("\n")
+            license.append(start + l.strip() + end + "\n")
         add_header(filename, license)
         return
 
 
 def lint(paths, config, fix=None, **lintargs):
     files = list(expand_exclusions(paths, config, lintargs['root']))
 
     licenses = load_valid_license()