aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Terjan <pterjan@gmail.com>2016-01-23 18:40:02 +0000
committerPascal Terjan <pterjan@gmail.com>2016-01-23 23:03:56 +0000
commit84174a38a9b094c3a5cbef07a48b84b9c65d5bf8 (patch)
treea8aab33c5d543f962d31fce6aabed65c2506118d
parent9e5158caa8a406cd58a592b5d8bb201bb2bb358c (diff)
downloadiurt-84174a38a9b094c3a5cbef07a48b84b9c65d5bf8.tar
iurt-84174a38a9b094c3a5cbef07a48b84b9c65d5bf8.tar.gz
iurt-84174a38a9b094c3a5cbef07a48b84b9c65d5bf8.tar.bz2
iurt-84174a38a9b094c3a5cbef07a48b84b9c65d5bf8.tar.xz
iurt-84174a38a9b094c3a5cbef07a48b84b9c65d5bf8.zip
Do not modify $run in the tree callbacks
-rwxr-xr-xulri14
1 files changed, 11 insertions, 3 deletions
diff --git a/ulri b/ulri
index 120b4b0..b662232 100755
--- a/ulri
+++ b/ulri
@@ -252,8 +252,6 @@ sub todo_func {
$arch =~ s/-.*//;
}
- $run{bot}{$host}{$bot} = $prefix;
-
# this should be in the cache, but waiting for a cache-clean option
$pkg_tree{$prefix}{media}{$media}{arch}{$arch} = 1;
@@ -309,6 +307,16 @@ check_upload_tree($todo, \&todo_func);
# time as the src.rpm in the todo tree
check_upload_tree($done, \&done_func);
+# Load bot status
+
+foreach my $prefix (keys %pkg_tree) {
+ my $ent = $pkg_tree{$prefix};
+ foreach my $media (keys %{$ent->{media}}) {
+ foreach my $bot (@{$ent->{media}{$media}{bot}}) {
+ $run{bot}{$bot->{host}}{$bot->{bot}} = $prefix;
+ }
+ }
+}
#
# Part 1: get results from finished builds
@@ -743,7 +751,7 @@ my %build_list;
foreach my $prefix (keys %pkg_tree) {
my $ent = $pkg_tree{$prefix};
foreach my $media (keys %{$ent->{media}}) {
- foreach my $bot (keys %{$ent->{media}{$media}{bot}}) {
+ foreach my $bot (@{$ent->{media}{$media}{bot}}) {
my $host = $bot->{host};
my $arch = $bot->{arch};
push @{$build_list{"$host/$arch"}}, $prefix;