aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Terjan <pterjan@mageia.org>2022-04-25 14:30:22 +0000
committerPascal Terjan <pterjan@mageia.org>2022-04-25 14:57:52 +0000
commite1b7d768bab93328f450ec13e230602df44ca6f3 (patch)
tree6408e487d4d125cf0e0d851357079d4b0546572e
parent1be1c9d62000e1fa7aedce432957e379bdeb305c (diff)
downloadiurt-e1b7d768bab93328f450ec13e230602df44ca6f3.tar
iurt-e1b7d768bab93328f450ec13e230602df44ca6f3.tar.gz
iurt-e1b7d768bab93328f450ec13e230602df44ca6f3.tar.bz2
iurt-e1b7d768bab93328f450ec13e230602df44ca6f3.tar.xz
iurt-e1b7d768bab93328f450ec13e230602df44ca6f3.zip
ulri: Better maintain in progress builds
-rw-r--r--NEWS1
-rwxr-xr-xulri8
2 files changed, 9 insertions, 0 deletions
diff --git a/NEWS b/NEWS
index b1a2682..dd3cb77 100644
--- a/NEWS
+++ b/NEWS
@@ -3,6 +3,7 @@
macros for Name and those can change based on the distro version.
- ulri: rely on status.log to know a build completed rather than having
packages of the right architecture.
+- ulri: Fix list of build in progress
0.7.16
- iurt: use --target noarch for noarch packages rather than the arch used to
diff --git a/ulri b/ulri
index aa6bf1f..aea8f68 100755
--- a/ulri
+++ b/ulri
@@ -314,6 +314,7 @@ foreach my $prefix (keys %pkg_tree) {
unlink $lock_file;
$run{bot}{$host}{$bot} = 0;
+ $ent->{media}{$media}{bot} = grep { $_->{pid} ne $pid || $_->{host} ne $host } @{$ent->{media}{$media}{bot}};
if (!$status) {
# TODO: fetch/clean the logs
@@ -542,6 +543,13 @@ foreach my $prefix (sort keys %pkg_tree) {
if ($pid) {
# Register that the package is building
$run{bot}{$host}{$bot} = $prefix;
+ push @{$pkg_tree{$prefix}{media}{$media}{bot}}, {
+ bot => $bot,
+ host => $host,
+ date => $fulldate,
+ pid => $pid,
+ 'arch' => $arch,
+ };
$pkg_tree{$prefix}{media}{$media}{arch}{$noarch ? 'noarch' : $arch} = 1;
my $lock_arch = $noarch ? "$arch-noarch" : $arch;