Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Jump to bottom

fix(license): return license separation using separators ,, or, etc. #6916

Merged
merged 6 commits into from
Jun 14, 2024
Merged

fix(license): return license separation using separators ,, or, etc. #6916

merged 6 commits into from
Jun 14, 2024

Conversation

DmitriyLewen
Copy link
Contributor

Description

After #6633 we don't split licenses for some language specific files.
see https://github.com/aquasecurity/trivy/pull/6633/files#diff-4da3755149e3538b3a9e2e1a51b97d42a999ae3d240c9d1ce00bdb33e7fceda9L99-L103

Fix this.

Related issues

Related PRs

Checklist

  • I've read the guidelines for contributing to this repository.
  • I've followed the conventions in the PR title.
  • I've added tests that prove my fix is effective or that my feature works.
  • I've updated the documentation with the relevant information (if needed).
  • I've added usage information (if the PR introduces new options)
  • I've included a "before" and "after" example to the description (if the PR is a user interface change).

@DmitriyLewen DmitriyLewen self-assigned this Jun 13, 2024
@DmitriyLewen DmitriyLewen marked this pull request as ready for review June 13, 2024 09:34
@DmitriyLewen DmitriyLewen requested a review from knqyf263 as a code owner June 13, 2024 09:34
@knqyf263
Copy link
Collaborator

knqyf263 commented Jun 14, 2024 •
edited
Loading

@DmitriyLewen Need to merge main so Test (ubuntu-latest-m) will run.

@knqyf263 knqyf263 enabled auto-merge June 14, 2024 07:14
@knqyf263 knqyf263 added this pull request to the merge queue Jun 14, 2024
Merged via the queue into aquasecurity:main with commit 52f7aa5 Jun 14, 2024
12 checks passed
@aqua-bot aqua-bot mentioned this pull request Jun 14, 2024
Merged
# for free to join this conversation on GitHub. Already have an account? # to comment
Reviewers

@knqyf263 knqyf263 knqyf263 approved these changes

Assignees

@DmitriyLewen DmitriyLewen

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

bug(licenses): Trivy doesn't separate licenses by ,, or, etc.
2 participants
@DmitriyLewen @knqyf263