diff options
author | Nicolas Vigier <boklm@mageia.org> | 2012-12-07 13:26:29 +0000 |
---|---|---|
committer | Nicolas Vigier <boklm@mageia.org> | 2012-12-07 13:26:29 +0000 |
commit | 4cb04d7864faca4cbe845afacca68c76932b7470 (patch) | |
tree | ab4890f9cb0d24546e34402a09103e9757364c07 | |
parent | b32f8b77327c207d679d504e7e7be68787124771 (diff) | |
download | iurt-4cb04d7864faca4cbe845afacca68c76932b7470.tar iurt-4cb04d7864faca4cbe845afacca68c76932b7470.tar.gz iurt-4cb04d7864faca4cbe845afacca68c76932b7470.tar.bz2 iurt-4cb04d7864faca4cbe845afacca68c76932b7470.tar.xz iurt-4cb04d7864faca4cbe845afacca68c76932b7470.zip |
emi: allow setting per distro mandatory_arch
emi is using $config->{mandatory_arch} to find the list of mandatory
architectures with successful build required to upload a package.
With this change it is now also possible to set per distro
mandatory_arch in $config->{mandatory_arch}->{$distro}. If no mandatory
architecture is defined for a distro, then $config->{mandatory_arch}->{default}
is used.
-rw-r--r-- | NEWS | 1 | ||||
-rwxr-xr-x | emi | 10 |
2 files changed, 10 insertions, 1 deletions
@@ -4,6 +4,7 @@ - allow setting some env variables to define and default to setting PERL_EXTUTILS_AUTOINSTALL and PERL_AUTOINSTALL to --skipdeps +- emi: allow setting per distro mandatory_arch 0.6.13 - use rpmbuild/ rather than rpm/ @@ -192,7 +192,15 @@ foreach my $prefix (sort keys %pkg_tree) { my $ok = 1; foreach my $section (keys %{$pkg_tree{$prefix}{section}}) { - my @wanted_archs = defined($pkg_tree{$prefix}{section}{$section}{arch}{noarch}) ? 'noarch' : @{$config->{mandatory_arch}}; + my $mandatory_arch = []; + if (ref $config->{mandatory_arch} eq 'ARRAY') { + $mandatory_arch = $config->{mandatory_arch}; + } elsif (ref $config->{mandatory_arch}->{$target} eq 'ARRAY') { + $mandatory_arch = $config->{mandatory_arch}->{$target}; + } elsif (ref $config->{mandatory_arch}->{default} eq 'ARRAY') { + $mandatory_arch = $config->{mandatory_arch}->{default}; + } + my @wanted_archs = defined($pkg_tree{$prefix}{section}{$section}{arch}{noarch}) ? 'noarch' : @{$mandatory_arch}; my $path = $pkg_tree{$prefix}{section}{$section}{path}; my %missing; |