diff --git a/src/backend/bs_publish b/src/backend/bs_publish index 7152182e08c..845d9617858 100755 --- a/src/backend/bs_publish +++ b/src/backend/bs_publish @@ -1632,7 +1632,7 @@ sub publish { } elsif ($bin =~ /\.packages$/) { $p = "$bin"; } elsif ($bin =~ /^(.*)\.report$/) { - # collect kiwi reports + # collect reports $kiwireport{$1} = readxml("$r/$rbin", $BSXML::report, 1); next; } elsif ($bin =~ /^(.*)\.index$/) { @@ -2028,6 +2028,19 @@ sub publish { $pt->{'binaryarch'} = $res->{'arch'} if defined $res->{'arch'}; $pt->{'id'} = "$bin/$s[9]/$s[7]/$s[1]"; $packtrack->{$bin} = $pt; + + # generic case like for python venv container in rpm + if ($bin =~ /.*\/(.*)$/ && $kiwireport{$1}) { + my $rpm_container = $1; + for my $kb (@{$kiwireport{$rpm_container}->{'binary'} || []}) { + my $pt = { %$kb }; + delete $pt->{'_content'}; + $pt->{'medium'} = $rpm_container; + my $fn = ''; + $fn .= "/".(defined($pt->{$_}) ? $pt->{$_} : '') for qw{binaryarch name epoch version release}; + $packtrack->{"$rpm_container$fn"} = $pt; + } + } } elsif ($kiwimedium{$bin} && $kiwireport{$kiwimedium{$bin}}) { my $medium = $bin; $medium =~ s/.*\///; # basename diff --git a/src/backend/bs_worker b/src/backend/bs_worker index 7987771dded..8f18d5a8637 100755 --- a/src/backend/bs_worker +++ b/src/backend/bs_worker @@ -3107,7 +3107,9 @@ sub dobuild { if (($kiwimode || '') eq 'product' && !$followupmode && $kiwiorigins) { createchannel("$buildroot/.build.packages/OTHER", $kiwiorigins); } - if ((!$kiwimode || $kiwimode ne 'product') && !$followupmode && $kiwiorigins) { + if (!$kiwimode && !$followupmode && $kiwiorigins) { + createkiwireport("$buildroot/.build.packages/OTHER", $kiwiorigins); + } elsif ((!$kiwimode || $kiwimode ne 'product') && !$followupmode && $kiwiorigins) { createkiwireport("$buildroot/.build.packages/KIWI", $kiwiorigins); } if (%$followupcopy) { diff --git a/src/backend/build b/src/backend/build index 97c38670173..58334f2591f 160000 --- a/src/backend/build +++ b/src/backend/build @@ -1 +1 @@ -Subproject commit 97c386701732c3dfdfbe303a66af0fa51b251655 +Subproject commit 58334f2591f0dc763b90f253c5a98b92d1e46d1b