From b5ebbc28c0e5fa84b460bfc5cab58fb0780dceab Mon Sep 17 00:00:00 2001 From: Michael Schroeder Date: Tue, 7 Sep 2021 18:33:00 +0200 Subject: [PATCH] [backend] get_modulemd: make use of passed module information This somehow was left out in the implementation. --- src/backend/BSSrcServer/Modulemd.pm | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/backend/BSSrcServer/Modulemd.pm b/src/backend/BSSrcServer/Modulemd.pm index ee6dd95ac63..23d16bbc297 100644 --- a/src/backend/BSSrcServer/Modulemd.pm +++ b/src/backend/BSSrcServer/Modulemd.pm @@ -113,7 +113,7 @@ sub tostream { } $md = $md->{'data'}; my ($versionprefix, $distprefix, @distprovides) = split(':', $modularityplatform); - my %distprovides = map {$_ => 1} @distprovides; + my %distprovides = map {$_ => $_} @distprovides; for (@distprovides) { $distprovides{"$1-*"} = $_ if /^(.*)-/; } @@ -133,7 +133,13 @@ sub tostream { last unless $good; } next unless $good; - my @newbuildrequires; + + # add modules data to provides + for (@{$modules || []}) { + $distprovides{$_} = $_; + $distprovides{"$1-*"} = $_ if /^(.*)-/; + } + my %brmap; for my $br (@$buildrequires) { my ($n, @v) = split(':', $br); @@ -166,6 +172,7 @@ sub tostream { my ($n, @v) = split(':', $_); $newdeps->{'buildrequires'}->{$n} = \@v; } + last; } die("could not select dependency block\n") unless $newdeps; $md->{'dependencies'} = [ $newdeps ];