oss/syft
2
0
Fork 0
mirror of https://github.com/anchore/syft.git synced 2026-11-04 16:36:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes #1179 Deprecated SPDX license (#1263)

Browse Source
This commit is contained in:
Marc-Etienne Vargenau
2022-10-14 15:54:57 -04:00
committed by GitHub
parent 89575199b8
commit 41bc6bb410
4 changed files with 84 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/spdxlicense/generate/license.go
+18 -1
View File
@@ -25,6 +25,23 @@ func (l License) canReplace(other License) bool {
return false
}
// We want to replace deprecated licenses with non-deprecated counterparts
// For more information, see: https://github.com/spdx/license-list-XML/issues/1676
if other.Deprecated {
switch {
case strings.ReplaceAll(l.ID, "-only", "") == other.ID:
return true
case strings.ReplaceAll(l.ID, "-or-later", "+") == other.ID:
return true
case l.ID == "BSD-2-Clause" && other.ID == "BSD-2-Clause-NetBSD":
return true
case l.ID == "BSD-2-Clause-Views" && other.ID == "BSD-2-Clause-FreeBSD":
return true
case l.ID == "bzip2-1.0.6" && other.ID == "bzip2-1.0.5":
return true
}
}
if l.Name != other.Name {
return false
}
@@ -43,7 +60,7 @@ func (l License) canReplace(other License) bool {
}
}
return l.ID != other.ID
return l.ID == other.ID
}
func (ll LicenseList) findReplacementLicense(deprecated License) *License {