From e25899465808ac13ed6ce60ef6dccb0b932f9337 Mon Sep 17 00:00:00 2001 From: Olivier Blin Date: Thu, 24 Nov 2016 13:27:09 +0000 Subject: Extract get_target_arch helper --- lib/Iurt/Config.pm | 7 +++++++ lib/Iurt/Emi.pm | 2 +- lib/Iurt/Queue.pm | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) (limited to 'lib') diff --git a/lib/Iurt/Config.pm b/lib/Iurt/Config.pm index 3bef604..c8250f8 100644 --- a/lib/Iurt/Config.pm +++ b/lib/Iurt/Config.pm @@ -21,6 +21,7 @@ our @EXPORT = qw( check_noarch get_package_prefix get_mandatory_arch + get_target_arch %arch_comp ); @@ -187,4 +188,10 @@ sub get_mandatory_arch { (ref($config->{mandatory_arch}) eq 'HASH' ? ($config->{mandatory_arch}{$target}, $config->{mandatory_arch}{default}) : ()), []; } +sub get_target_arch { + my ($config, $target) = @_; + find { ref($_) eq 'ARRAY' } $config->{arch}, + (ref($config->{arch}) eq 'HASH' ? ($config->{arch}{$target}, $config->{arch}{default}) : ()), [ keys %{$config->{bot}} ]; +} + 1; diff --git a/lib/Iurt/Emi.pm b/lib/Iurt/Emi.pm index 569024c..284ea2d 100644 --- a/lib/Iurt/Emi.pm +++ b/lib/Iurt/Emi.pm @@ -2,7 +2,7 @@ package Iurt::Emi; use base qw(Exporter); use File::Path qw(make_path); -use Iurt::Config qw(get_author_email get_mandatory_arch); +use Iurt::Config qw(get_author_email get_mandatory_arch get_target_arch); use Iurt::Mail qw(sendmail); use Iurt::Queue qw(check_if_all_archs_processed); use Iurt::Util qw(plog); diff --git a/lib/Iurt/Queue.pm b/lib/Iurt/Queue.pm index d065713..3fc40bd 100644 --- a/lib/Iurt/Queue.pm +++ b/lib/Iurt/Queue.pm @@ -3,7 +3,7 @@ package Iurt::Queue; use base qw(Exporter); use File::Copy 'move'; use File::Path 'make_path'; -use Iurt::Config qw(get_mandatory_arch); +use Iurt::Config qw(get_mandatory_arch get_target_arch); use Iurt::File qw(read_line); use Iurt::Util qw(plog); use MDK::Common qw(cat_ find member partition); -- cgit v1.2.1