diff options
| -rw-r--r-- | lib/Iurt/Queue.pm | 4 | ||||
| -rwxr-xr-x | ulri | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/lib/Iurt/Queue.pm b/lib/Iurt/Queue.pm index 3f552b9..c4c79ad 100644 --- a/lib/Iurt/Queue.pm +++ b/lib/Iurt/Queue.pm @@ -55,10 +55,10 @@ sub apply_to_upload_tree { } sub check_if_mandatory_arch_failed { - my ($done_dir, $prefix, $ent, $config) = @_; + my ($media, $prefix, $ent, $config) = @_; my $mandatory_arch = get_mandatory_arch($config, $ent->{target}); foreach my $arch (@$mandatory_arch) { - return 1 if -f "${done_dir}/${prefix}_${arch}.fail"; + return 1 if $ent->{media}{$media}{failed_arch}{$arch}; } } @@ -384,7 +384,7 @@ foreach my $prefix (keys %pkg_tree) { make_path("$done_dir/$prefix"); sget($remote, "$prefix_dir/log/*", "$done_dir/$prefix"); ssh($remote, "rm -rf $prefix_dir"); - if (check_if_mandatory_arch_failed($done_dir, $prefix, $ent, $config)) { + if (check_if_mandatory_arch_failed($media, $prefix, $ent, $config)) { cleanup_failed_build($todo_dir, $done_dir, $fail_dir, $prefix, $ent, $arch, $config); } else { $something_finished = 1; @@ -398,6 +398,7 @@ foreach my $prefix (keys %pkg_tree) { plog('FAIL', "build failed"); create_file("$done_dir/${prefix}_$arch.fail", "$bot $host"); + $pkg_tree{$prefix}{media}{$media}{failed_arch}{$arch} = 1; make_path($fail_dir); mkdir("$fail_dir/$prefix"); |