From 32c495d791683bec3d374e6dd570d5e187d7b2d5 Mon Sep 17 00:00:00 2001 From: Pascal Terjan Date: Mon, 5 May 2014 16:10:51 +0000 Subject: Only register a package as building after we managed to contact the build node --- NEWS | 1 + ulri | 13 ++++++------- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/NEWS b/NEWS index fd486b2..d4ebb2a 100644 --- a/NEWS +++ b/NEWS @@ -1,5 +1,6 @@ - don't close stdin if --stop is used (mga#13318) - add a README +- fix builds being skipped when a build node is unreachable 0.6.21 - fix code handling dependencies diff --git a/ulri b/ulri index 6da5f20..aadf51a 100755 --- a/ulri +++ b/ulri @@ -613,15 +613,8 @@ foreach my $prefix (sort keys %pkg_tree) { foreach my $bot (keys %{$config->{bot}{$arch}{$host}}) { next if $run{bot}{$host}{$bot}; - # Enable noarch lock after the first bot snarfs the package - # - $noarch_build{$prefix} = 1 if $noarch; - plog('INFO', "building on $host/$arch ($bot)"); - $run{bot}{$host}{$bot} = $prefix; - $compildone->{$prefix}{$media}{$arch} = 1; - my $bot_conf = $config->{bot}{$arch}{$host}{$bot}; my $remote = ssh_setup($config->{ssh_options}, $bot_conf->{user}, $host); @@ -643,6 +636,12 @@ foreach my $prefix (sort keys %pkg_tree) { } next unless $ok; + # Register that the package is building + $run{bot}{$host}{$bot} = $prefix; + $compildone->{$prefix}{$media}{$arch} = 1; + # Enable noarch lock after the first bot snarfs the package + $noarch_build{$prefix} = 1 if $noarch; + # spawn remote build bot and save output on local file # (remove status.log before building, otherwise we can have # a install_deps_failure and reschedule even if the package -- cgit v1.2.1