aboutsummaryrefslogtreecommitdiffstats
path: root/ulri
diff options
context:
space:
mode:
authorPascal Terjan <pterjan@gmail.com>2016-10-20 15:18:25 +0100
committerPascal Terjan <pterjan@gmail.com>2016-10-20 20:25:53 +0100
commit35d26e4034d10592401c25801290e2b7fb111198 (patch)
tree35eb7155e42c0b404bae2e9d15b046ba79db2884 /ulri
parent45e72c069afa78e2939d43f0a3cefe8012a93ba8 (diff)
downloadiurt-35d26e4034d10592401c25801290e2b7fb111198.tar
iurt-35d26e4034d10592401c25801290e2b7fb111198.tar.gz
iurt-35d26e4034d10592401c25801290e2b7fb111198.tar.bz2
iurt-35d26e4034d10592401c25801290e2b7fb111198.tar.xz
iurt-35d26e4034d10592401c25801290e2b7fb111198.zip
Only mandatory arches are fatal
Currently any previous failures casues to force fail anything succeeding later.
Diffstat (limited to 'ulri')
-rwxr-xr-xulri5
1 files changed, 2 insertions, 3 deletions
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;