From 28bf6f71f088d12156fba5d125870e9c8a8e50cb Mon Sep 17 00:00:00 2001 From: Timothy Legge Date: Tue, 3 Mar 2020 19:14:05 +0000 Subject: apkbuild-cpan.in: fix parse_deps for multiple CPAN::Meta::Requirements return unique do_depends can send multiple meta dependencies as additional parameters parse_deps was not itterating through each of the parameters this fix gets the entire list without duplicate entries --- apkbuild-cpan.in | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/apkbuild-cpan.in b/apkbuild-cpan.in index c023deb..c538d34 100755 --- a/apkbuild-cpan.in +++ b/apkbuild-cpan.in @@ -124,22 +124,23 @@ sub parse_deps { my $response; my $deps = ""; - for my $module ($reqs->required_modules) { - if (Module::CoreList->is_core($module)) { - my $perlver = Module::CoreList->first_release($module); - say "$module is part of core perl since $perlver."; - next; + foreach $reqs (@_) { + for my $module ($reqs->required_modules) { + if (Module::CoreList->is_core($module)) { + my $perlver = Module::CoreList->first_release($module); + say "$module is part of core perl since $perlver."; + next; + } + next if $module eq 'perl'; + + # map module name to package name + $response = $ua->get("https://fastapi.metacpan.org/module/$module"); + $response->is_success or die $response->status_line; + my $moddata = $json->decode($response->decoded_content); + $moddata->{error} and die "Error trying to locate $module: $moddata->{error}\n"; + $distfiles->{$module} = $moddata->{distribution}; } - next if $module eq 'perl'; - - # map module name to package name - $response = $ua->get("https://fastapi.metacpan.org/module/$module"); - $response->is_success or die $response->status_line; - my $moddata = $json->decode($response->decoded_content); - $moddata->{error} and die "Error trying to locate $module: $moddata->{error}\n"; - $distfiles->{$module} = $moddata->{distribution}; } - # map package names to alpine packages foreach ( keys %{ $distfiles } ) { $response = $ua->get("https://fastapi.metacpan.org/module/$_"); @@ -148,7 +149,7 @@ sub parse_deps { $distdata->{error} and die "Error trying to locate $_: $distdata->{error}\n"; my $pkgname = map_cpan_to_apk($distdata->{distribution}); - $deps .= "$pkgname "; + $deps .= "$pkgname " unless $deps =~ m/$pkgname/; } $deps =~ s/\h+/ /g; $deps =~ s/ $//; -- cgit v1.2.3