Skip to content

Commit bca071f

Browse files
Fix synclick script and update misc test expectations
Signed-off-by: Ayan Sinha Mahapatra <ayansmahapatra@gmail.com>
1 parent 162cffb commit bca071f

7 files changed

Lines changed: 54 additions & 53 deletions

File tree

etc/scripts/licenses/synclic.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1293,11 +1293,11 @@ def synchronize_licenses(
12931293
else:
12941294
# Create a new ScanCode license
12951295
external_license.key = matching_key
1296-
scancode_license = external_license.dump(
1296+
external_license.dump(
12971297
licenses_data_dir=licensedcode.models.licenses_data_dir
12981298
)
12991299
added_to_scancode.add(matching_key)
1300-
scancodes_by_key[matching_key] = scancode_license
1300+
scancodes_by_key[matching_key] = external_license
13011301
if TRACE:
13021302
print(
13031303
"External license key not in ScanCode:",
@@ -1327,9 +1327,9 @@ def synchronize_licenses(
13271327
if scancode_license.is_deprecated:
13281328
continue
13291329

1330-
external_license = scancode_license.dump(licenses_data_dir=external_source.new_dir)
1330+
scancode_license.dump(licenses_data_dir=external_source.new_dir)
13311331
added_to_external.add(lkey)
1332-
externals_by_key[lkey] = external_license
1332+
externals_by_key[lkey] = scancode_license
13331333

13341334
if TRACE_DEEP:
13351335
print("ScanCode license key not in External:", lkey, "created in External.")

tests/licensedcode/data/datadriven/external/glc/BSD-2-Clause.t2.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
license_expressions:
22
- unknown-license-reference
3-
- bsd-simplified
3+
- libutil-david-nugent
44
- bsd-simplified
55
notes: |
66
License test derived from a file of the BSD-licensed repository at:

tests/licensedcode/data/models/license_file_dump/apache-2.0.LICENSE

Lines changed: 26 additions & 26 deletions
Large diffs are not rendered by default.

tests/licensedcode/data/models/rule_file_dump/0051_gpl-2.0.RULE

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@ notes: GPL 2 small change
44
---
55

66
This program is free software; you can redistribute it and/or modify
7-
it under the terms of the GNU General Public License as published by
8-
the Free Software Foundation; version 2 dated June, 1991.
7+
it under the terms of the GNU General Public License as published by
8+
the Free Software Foundation; version 2 dated June, 1991.
99

10-
This program is distributed in the hope that it will be useful,
11-
but WITHOUT ANY WARRANTY; without even the implied warranty of
12-
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13-
GNU General Public License for more details.
10+
This program is distributed in the hope that it will be useful,
11+
but WITHOUT ANY WARRANTY; without even the implied warranty of
12+
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13+
GNU General Public License for more details.
1414

15-
You should have received a copy of the GNU General Public License along
16-
with this program; if not, write to the Free Software Foundation, Inc.,
17-
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
15+
You should have received a copy of the GNU General Public License along
16+
with this program; if not, write to the Free Software Foundation, Inc.,
17+
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.

tests/licensedcode/data/plugin_licenses_reference/license-reference-works-with-clues.expected.json

Lines changed: 10 additions & 9 deletions
Large diffs are not rendered by default.

tests/licensedcode/data/plugin_licenses_reference/scan-matched-text-with-reference.expected.json

Lines changed: 2 additions & 2 deletions
Large diffs are not rendered by default.

tests/licensedcode/data/plugin_licenses_reference/scan-with-reference.expected.json

Lines changed: 2 additions & 2 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)