From 35d26e4034d10592401c25801290e2b7fb111198 Mon Sep 17 00:00:00 2001 From: Pascal Terjan Date: Thu, 20 Oct 2016 15:18:25 +0100 Subject: Only mandatory arches are fatal Currently any previous failures casues to force fail anything succeeding later. --- ulri | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'ulri') diff --git a/ulri b/ulri index 2e29418..1df576f 100755 --- a/ulri +++ b/ulri @@ -36,7 +36,7 @@ use MDK::Common qw(any cat_ if_ find); use Iurt::Config qw(config_usage get_date config_init get_author_email check_arch check_noarch); use Iurt::File qw(create_file); use Iurt::Process qw(check_pid); -use Iurt::Queue qw(cleanup_failed_build get_upload_tree_state); +use Iurt::Queue qw(check_if_mandatory_arch_failed cleanup_failed_build get_upload_tree_state); use Iurt::Mail qw(sendmail); use Iurt::Util qw(plog_init plog ssh_setup ssh sout sget sput); use Iurt::Ulri qw(build_package warn_about_failure); @@ -384,8 +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 (-d "$fail_dir/$prefix") { - # Other arch had failed + if (check_if_mandatory_arch_failed($done_dir, $prefix, $ent, $config)) { cleanup_failed_build($todo_dir, $done_dir, $fail_dir, $prefix, $ent, $arch, $config); } else { $something_finished = 1; -- cgit v1.2.1