fix(spdxutils): Improve handling of Dual-license for SPDXTV #3123
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
implodeLicenses() explicitely parses for "Dual-license". If a user decides to add a custom text for the Dual-license conclusion the license name will be Dual-license-MD5. In this case dual licensing is not reflected correctly in the SPDX2TV report. Change the behaviour of implodeLicenses to look for the prefix Dual-license to fix the generation of SPDX2TV reports for Dual-license with custom text. Signed-off-by: Jan Altenberg <jan.altenberg@osadl.org>
43e91e5 to
6d9e289
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
implodeLicenses() explicitely parses for "Dual-license". If a user decides to add a custom text for the Dual-license conclusion the license name will be Dual-license-MD5. In this case dual licensing is not reflected correctly in the SPDX2TV report. Instead of:
it will be reflected as
Changes
Change the behaviour of implodeLicenses to look for the prefix Dual-license to fix the generation of SPDX2TV reports for Dual-license with custom text.
How to test
Without the changes in this pull request Dual-license is not handled correctly (LicenseA AND LicenseB AND LicenseRef-fossology-Dual-license-MD5). With these changes applied, the resulting statement is correct (LicenseA OR LicenseB).