From 074dda99e1fc975bd88b7276b482bd861e92b802 Mon Sep 17 00:00:00 2001 From: Kaushik Iska Date: Tue, 14 Jun 2022 11:36:55 -0400 Subject: [PATCH 1/4] Update license script to ignore NOTICE.fuchsia file More context at http://fxb/94240 --- ci/licenses_golden/tool_signature | 2 +- tools/licenses/lib/main.dart | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/ci/licenses_golden/tool_signature b/ci/licenses_golden/tool_signature index dd1a1469ee94e..69d7ecfc3bf06 100644 --- a/ci/licenses_golden/tool_signature +++ b/ci/licenses_golden/tool_signature @@ -1,2 +1,2 @@ -Signature: 1177a4d90f87bc4a0198864901db40ab +Signature: ce5af457f15c7a69fe65681c568295fe diff --git a/tools/licenses/lib/main.dart b/tools/licenses/lib/main.dart index 2cc0744ce8446..59014ce63b611 100644 --- a/tools/licenses/lib/main.dart +++ b/tools/licenses/lib/main.dart @@ -2370,6 +2370,10 @@ class _RepositoryFuchsiaDirectory extends _RepositoryDirectory { @override bool shouldRecurse(fs.IoNode entry) { return entry.name != 'toolchain' + // Applies to NOTICE.fuchsia file. + // This is a file that covers things that contribute to the Fuchsia SDK. + // See: fxb/94240 + && !entry.name.endsWith('.fuchsia') && super.shouldRecurse(entry); } From 6578921c2799f04689275b57c528a29f1cc5c8f6 Mon Sep 17 00:00:00 2001 From: Kaushik Iska Date: Tue, 14 Jun 2022 17:34:34 +0000 Subject: [PATCH 2/4] fix tool signature --- ci/licenses_golden/tool_signature | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/licenses_golden/tool_signature b/ci/licenses_golden/tool_signature index 69d7ecfc3bf06..1548815ade4e5 100644 --- a/ci/licenses_golden/tool_signature +++ b/ci/licenses_golden/tool_signature @@ -1,2 +1,2 @@ -Signature: ce5af457f15c7a69fe65681c568295fe +Signature: bcec238076c866e32dd383a9e0001a54 From 5bb7a246ed24c14565137b6320d3d4b45a228daa Mon Sep 17 00:00:00 2001 From: Kaushik Iska Date: Tue, 14 Jun 2022 19:27:10 +0000 Subject: [PATCH 3/4] use exact equals --- tools/licenses/lib/main.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/licenses/lib/main.dart b/tools/licenses/lib/main.dart index 59014ce63b611..ab4c2587788d5 100644 --- a/tools/licenses/lib/main.dart +++ b/tools/licenses/lib/main.dart @@ -2373,7 +2373,7 @@ class _RepositoryFuchsiaDirectory extends _RepositoryDirectory { // Applies to NOTICE.fuchsia file. // This is a file that covers things that contribute to the Fuchsia SDK. // See: fxb/94240 - && !entry.name.endsWith('.fuchsia') + && !(entry.name == 'NOTICE.fuchsia') && super.shouldRecurse(entry); } From 28e7011563382c5c4583681ff334c11994ebc21d Mon Sep 17 00:00:00 2001 From: Kaushik Iska Date: Tue, 14 Jun 2022 19:48:05 +0000 Subject: [PATCH 4/4] fix licenses --- ci/licenses_golden/tool_signature | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/licenses_golden/tool_signature b/ci/licenses_golden/tool_signature index 1548815ade4e5..0c09fd6deff2c 100644 --- a/ci/licenses_golden/tool_signature +++ b/ci/licenses_golden/tool_signature @@ -1,2 +1,2 @@ -Signature: bcec238076c866e32dd383a9e0001a54 +Signature: 808fd97f7e34a2388888f371bb74e2fb