From 1a279564d3ac828254ac0a2c0948643ba02c0155 Mon Sep 17 00:00:00 2001 From: Michael Schroeder Date: Tue, 7 Sep 2021 12:27:35 +0200 Subject: [PATCH] [backend] fix typo that made getmodulemd ignore the configured modules The module names are passed as "module", not "modules". --- src/backend/BSRepServer/BuildInfo.pm | 2 +- src/backend/bs_srcserver | 2 +- src/backend/bs_worker | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/backend/BSRepServer/BuildInfo.pm b/src/backend/BSRepServer/BuildInfo.pm index b81d46f8c84..00146729bae 100644 --- a/src/backend/BSRepServer/BuildInfo.pm +++ b/src/backend/BSRepServer/BuildInfo.pm @@ -193,7 +193,7 @@ sub getmodulemddata { push @args, "package=$buildinfo->{'modularity_package'}"; push @args, "srcmd5=$buildinfo->{'modularity_srcmd5'}"; push @args, "arch=$buildinfo->{'arch'}"; - push @args, map {"module=$_"} @{$buildinfo->{'module'}}; + push @args, map {"module=$_"} @{$buildinfo->{'module'} || []}; push @args, "modularityplatform=$buildinfo->{'modularity_platform'}"; push @args, "modularitylabel=$buildinfo->{'modularity_label'}"; push @args, "view=yaml"; diff --git a/src/backend/bs_srcserver b/src/backend/bs_srcserver index c5031d9f0de..634198776ce 100755 --- a/src/backend/bs_srcserver +++ b/src/backend/bs_srcserver @@ -5916,7 +5916,7 @@ sub getmodulemd { my $mds = BSSrcServer::Modulemd::read_modulemds($yaml); for my $md (@$mds) { next unless $md->{'document'} eq 'modulemd'; - BSSrcServer::Modulemd::tostream($md, $cgi->{'modules'} || [], $cgi->{'modularitylabel'}, $cgi->{'modularityplatform'}); + BSSrcServer::Modulemd::tostream($md, $cgi->{'module'} || [], $cgi->{'modularitylabel'}, $cgi->{'modularityplatform'}); $md->{'data'}->{'arch'} = $cgi->{'arch'} if $cgi->{'arch'}; } my $view = $cgi->{'view'} || 'storable'; diff --git a/src/backend/bs_worker b/src/backend/bs_worker index 3d0928026b0..b7d6dbd4781 100755 --- a/src/backend/bs_worker +++ b/src/backend/bs_worker @@ -1139,7 +1139,7 @@ sub getmodulemddata { my ($buildinfo, $dir) = @_; my $server = $buildinfo->{'srcserver'} || $srcserver; my @args; - push @args, map {"module=$_"} @{$buildinfo->{'module'}}; + push @args, map {"module=$_"} @{$buildinfo->{'module'} || []}; push @args, "modularityplatform=$buildinfo->{'modularity_platform'}"; push @args, "modularitylabel=$buildinfo->{'modularity_label'}"; my $mds = BSRPC::rpc({