aboutsummaryrefslogtreecommitdiffstats
path: root/ulri
diff options
context:
space:
mode:
authorPascal Terjan <pterjan@gmail.com>2016-10-11 09:06:22 +0100
committerPascal Terjan <pterjan@gmail.com>2016-10-11 09:06:22 +0100
commitbe053c1ef4f64b106657902b3b37cd5e3c7ce22e (patch)
tree94d7ec814a374ac2e3835620fcdd22407c56117e /ulri
parentcc76f64e8faa77cfcc93a9d56f6b86cfd8cade10 (diff)
downloadiurt-be053c1ef4f64b106657902b3b37cd5e3c7ce22e.tar
iurt-be053c1ef4f64b106657902b3b37cd5e3c7ce22e.tar.gz
iurt-be053c1ef4f64b106657902b3b37cd5e3c7ce22e.tar.bz2
iurt-be053c1ef4f64b106657902b3b37cd5e3c7ce22e.tar.xz
iurt-be053c1ef4f64b106657902b3b37cd5e3c7ce22e.zip
Fix reuse of {arch} part of the tree
It is used by ulri for both builds in progress and already done, while emi expects it to be only for done ones. This causes to upload only part of mandatory arches and later reject the other.
Diffstat (limited to 'ulri')
-rwxr-xr-xulri4
1 files changed, 3 insertions, 1 deletions
diff --git a/ulri b/ulri
index bd544b2..1e36f98 100755
--- a/ulri
+++ b/ulri
@@ -375,6 +375,7 @@ foreach my $prefix (keys %pkg_tree) {
if ($done) {
create_file("$done_dir/${prefix}_$arch.done", "$bot $host");
+ $pkg_tree{$prefix}{media}{$media}{done_arch}{$arch} = 1;
$success = 1;
}
@@ -491,9 +492,10 @@ foreach my $prefix (sort keys %pkg_tree) {
# need to find a bot for each arch
foreach my $arch (@arch_list) {
# Skip this arch if the package is already building as noarch or for this arch
- # or if it should not be built on this arch or it has already failed
+ # or if it should not be built on this arch or it has already failed or succeeded
next if $pkg_tree{$prefix}{media}{$media}{arch}{noarch};
next if $pkg_tree{$prefix}{media}{$media}{arch}{$arch};
+ next if $pkg_tree{$prefix}{media}{$media}{done_arch}{$arch};
next if $pkg_tree{$prefix}{media}{$media}{excluded_arch}{$arch};
next if $pkg_tree{$prefix}{media}{$media}{failed_arch}{$arch};