Skip to content

Commit

Permalink
Revert "just join licenses if multiple ones"
Browse files Browse the repository at this point in the history
This reverts commit ec4735f.
  • Loading branch information
cschneemann committed May 3, 2024
1 parent ec4735f commit 0cc3648
Showing 1 changed file with 2 additions and 5 deletions.
7 changes: 2 additions & 5 deletions generate_sbom
Original file line number Diff line number Diff line change
Expand Up @@ -324,11 +324,8 @@ sub parse_debian_copyright_file {
$ret{'copyright'} = join('\n ', sort @copyright_uniq);
%seen = ();
my @license_uniq = grep { !$seen{$_} ++ } @license;
if ( @license_uniq > 1 ) {
$ret{'license'} = join(' AND ', sort @license_uniq);
} else {
$ret{'license'} = @license_uniq[0];
}
$ret{'license'} = join(' AND ', sort @license_uniq);

} else {
%ret = undef;
}
Expand Down

0 comments on commit 0cc3648

Please sign in to comment.