diff options
author | Olivier Blin <dev@blino.org> | 2016-11-24 13:27:09 +0000 |
---|---|---|
committer | Pascal Terjan <pterjan@gmail.com> | 2016-11-24 13:27:09 +0000 |
commit | e25899465808ac13ed6ce60ef6dccb0b932f9337 (patch) | |
tree | 67d7867047dfa8bd65a15e7827bb653a580a2a50 /ulri | |
parent | 5df7c6f90fd6ad53df1ad39e2ea383be543f4ba1 (diff) | |
download | iurt-e25899465808ac13ed6ce60ef6dccb0b932f9337.tar iurt-e25899465808ac13ed6ce60ef6dccb0b932f9337.tar.gz iurt-e25899465808ac13ed6ce60ef6dccb0b932f9337.tar.bz2 iurt-e25899465808ac13ed6ce60ef6dccb0b932f9337.tar.xz iurt-e25899465808ac13ed6ce60ef6dccb0b932f9337.zip |
Extract get_target_arch helper
Diffstat (limited to 'ulri')
-rwxr-xr-x | ulri | 7 |
1 files changed, 3 insertions, 4 deletions
@@ -33,7 +33,7 @@ use strict; use MDK::Common qw(any cat_ if_ find); -use Iurt::Config qw(config_usage get_date config_init get_author_email check_arch check_noarch); +use Iurt::Config qw(config_usage get_date config_init get_author_email check_arch check_noarch get_target_arch); use Iurt::File qw(create_file); use Iurt::Process qw(check_pid); use Iurt::Queue qw(check_if_mandatory_arch_failed cleanup_failed_build get_upload_tree_state); @@ -492,10 +492,9 @@ foreach my $prefix (sort keys %pkg_tree) { next if $pkg_tree{$prefix}{media}{$media}{arch}{noarch}; next if $pkg_tree{$prefix}{media}{$media}{done_arch}{noarch}; - my $arch_list = find { ref($_) eq 'ARRAY' } $config->{arch}, (ref($config->{arch}) eq 'HASH' ? ($config->{arch}{$target}, $config->{arch}{default}) : ()); - my @arch_list = $arch_list ? @$arch_list : keys %{$config->{bot}}; + my $arch_list = get_target_arch($config, $target); # need to find a bot for each arch - foreach my $arch (@arch_list) { + foreach my $arch (@$arch_list) { # Skip this arch if the package is already building for it or if it # should not be built on this arch or it has already failed or # succeeded. |