Merge pull request #13894 from mlschroe/master

[backend] fix aggregation of sbom files for kiwi containers
openSUSE · Feb 24, 2023 · 822086e · 822086e
2 parents fdf0dc0 + 4473fab
commit 822086e
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/src/backend/BSSched/BuildJob/Aggregate.pm b/src/backend/BSSched/BuildJob/Aggregate.pm
@@ -490,8 +490,14 @@ sub build {
 	    # copy extra data like .packages or .basepackages
 	    my $extraprefix = $containerinfofile;
 	    $extraprefix =~ s/\.containerinfo//;
+	    for my $extra ('.spdx.json', '.cdx.json') {
+	      if (-e "$dir/$prefix$extraprefix$extra") {
+		BSUtil::cp("$dir/$prefix$extraprefix$extra", "$jobdatadir/$extraprefix$extra");
+		$jobbins{"$extraprefix$extra"} = 1;
+	      }
+	    }
 	    $extraprefix =~ s/\.docker// unless -e "$dir/$prefix$extraprefix.packages";
-	    for my $extra ('.basepackages', '.packages', '.report', '.verified', '.spdx.json', '.cdx.json') {
+	    for my $extra ('.basepackages', '.packages', '.report', '.verified') {
 	      if (-e "$dir/$prefix$extraprefix$extra") {
 		BSUtil::cp("$dir/$prefix$extraprefix$extra", "$jobdatadir/$extraprefix$extra");
 		$jobbins{"$extraprefix$extra"} = 1;