aboutsummaryrefslogtreecommitdiffstats
path: root/emi
diff options
context:
space:
mode:
authorOlivier Blin <dev@blino.org>2015-11-08 23:59:29 +0100
committerOlivier Blin <dev@blino.org>2015-11-17 00:11:40 +0100
commit2cafdf6269c73d980f5a6491fccc321e101283d6 (patch)
tree860887ad9455414b0901124c564a4df59150fed6 /emi
parent497c1565e90d4587b2fdc3cd69f69c3e55570988 (diff)
downloadiurt-2cafdf6269c73d980f5a6491fccc321e101283d6.tar
iurt-2cafdf6269c73d980f5a6491fccc321e101283d6.tar.gz
iurt-2cafdf6269c73d980f5a6491fccc321e101283d6.tar.bz2
iurt-2cafdf6269c73d980f5a6491fccc321e101283d6.tar.xz
iurt-2cafdf6269c73d980f5a6491fccc321e101283d6.zip
Extract get_mandatory_arch helper
Diffstat (limited to 'emi')
-rwxr-xr-xemi8
1 files changed, 3 insertions, 5 deletions
diff --git a/emi b/emi
index 0b127e6..ffc4c47 100755
--- a/emi
+++ b/emi
@@ -29,7 +29,7 @@
use strict;
use File::Path qw(make_path);
-use Iurt::Config qw(config_usage config_init get_author_email);
+use Iurt::Config qw(config_usage config_init get_author_email get_mandatory_arch);
use Iurt::Process qw(check_pid);
use Iurt::Mail qw(sendmail);
use Iurt::File qw(check_upload_tree);
@@ -192,8 +192,7 @@ foreach my $prefix (sort keys %pkg_tree) {
my $ok = 1;
foreach my $section (keys %{$pkg_tree{$prefix}{section}}) {
- my $mandatory_arch = find { ref($_) eq 'ARRAY' } $config->{mandatory_arch},
- (ref($config->{mandatory_arch}) eq 'HASH' ? ($config->{mandatory_arch}{$target}, $config->{mandatory_arch}{default}) : ()), [];
+ my $mandatory_arch = get_mandatory_arch($config, $target);
my @wanted_archs = defined($pkg_tree{$prefix}{section}{$section}{arch}{noarch}) ? 'noarch' : @$mandatory_arch;
my $path = $pkg_tree{$prefix}{section}{$section}{path};
my %missing;
@@ -299,8 +298,7 @@ sub upload_prefix_in_section {
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}};
# If we are here, mandatory arches are done, no need to check them
- my $mandatory_arch = find { ref($_) eq 'ARRAY' } $config->{mandatory_arch},
- (ref($config->{mandatory_arch}) eq 'HASH' ? ($config->{mandatory_arch}{$target}, $config->{mandatory_arch}{default}) : ()), [];
+ my $mandatory_arch = get_mandatory_arch($config, $target);
foreach my $arch (difference2(@arch_list, $mandatory_arch)) {
next if $pkg_tree{$prefix}{section}{$section}{arch}{$arch};
$all_done = 0;