Commit 483895b
committed
fix(spdx): Set the
Previously, only ORT's `concludedLicense` from a package curation was
taken into account. However, if solely detected license findings were
cleared via license finding curations from package configurations, that
did not have any impact at all until now.
To fix this, use the effective license with a custom license view of the
declared and detected licenses as a fallback if no concluded license is
set.
Finally, the `licenseConcluded` should only be set if (human) clearance
work was involved, so only set it if it differs from the
`licenseDeclared`. If `licenseDeclared` already was correct from the
start, then this needs to be "acknowledged" by manually setting the
concluded license to the same expression.
Signed-off-by: Sebastian Schuberth <sebastian@doubleopen.org>licenseConcluded via ORT's effective license1 parent 110da7a commit 483895b
1 file changed
+10
-4
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
30 | 30 | | |
31 | 31 | | |
32 | 32 | | |
| 33 | + | |
33 | 34 | | |
34 | 35 | | |
35 | 36 | | |
| |||
159 | 160 | | |
160 | 161 | | |
161 | 162 | | |
| 163 | + | |
| 164 | + | |
| 165 | + | |
| 166 | + | |
| 167 | + | |
| 168 | + | |
162 | 169 | | |
163 | 170 | | |
164 | 171 | | |
| |||
182 | 189 | | |
183 | 190 | | |
184 | 191 | | |
185 | | - | |
186 | | - | |
| 192 | + | |
| 193 | + | |
187 | 194 | | |
188 | | - | |
189 | | - | |
| 195 | + | |
190 | 196 | | |
191 | 197 | | |
192 | 198 | | |
| |||
0 commit comments