From 38425bac88cd65c84af69400d256eac01ea3b9af Mon Sep 17 00:00:00 2001 From: Olivier Blin Date: Mon, 2 Nov 2015 01:44:24 +0100 Subject: Link noarch files only for architectures of the current target Previously, it was trying to link noarch files for all arches listed in the config file, independently of the target. This commit uses the newly introduced get_target_arches() method from Youri::Repository. Also adapt the commented line in Deps.pm --- lib/Youri/Submit/Action/Link.pm | 2 +- lib/Youri/Submit/Check/Deps.pm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/Youri/Submit/Action/Link.pm b/lib/Youri/Submit/Action/Link.pm index 7e69683..ce722f1 100644 --- a/lib/Youri/Submit/Action/Link.pm +++ b/lib/Youri/Submit/Action/Link.pm @@ -43,7 +43,7 @@ sub run { $file =~ s/^\d{14}\.\w*\.\w+\.\d+_//; $file =~ s/^\@\d+://; - foreach my $arch ($repository->get_extra_arches()) { + foreach my $arch ($repository->get_target_arches($target)) { # compute installation target, forcing arch my $other_dir = $repository->get_install_dir( $package, diff --git a/lib/Youri/Submit/Check/Deps.pm b/lib/Youri/Submit/Check/Deps.pm index f8d5d89..129ee8c 100644 --- a/lib/Youri/Submit/Check/Deps.pm +++ b/lib/Youri/Submit/Check/Deps.pm @@ -72,7 +72,7 @@ sub run { my $arch = 'x86_64'; my @exclusivearchs = $package->get_tag("exclusivearchs"); return if @exclusivearchs && ! (grep {$_ eq $arch} @exclusivearchs); -# foreach my $arch ($repository->get_extra_arches()) { +# foreach my $arch ($repository->get_target_arches($target)) { my $media = new Youri::Media::URPM(name => "core.".$arch, type => "binary", synthesis => "$path/$arch/media/$section/media_info/synthesis.hdlist.cz"); -- cgit v1.2.1