Do not rebuild noarch packages that are already building/built

1 files changed, 8 insertions, 3 deletions

diff --git a/ulri b/ulri
index 1e36f98..4ca43f3 100755
--- a/ulri
+++ b/ulri
@@ -487,13 +487,18 @@ foreach my $prefix (sort keys %pkg_tree) {
 	my $noarch = 1;
 	$noarch = 0 if any { !check_noarch("$todo_dir/${prefix}_$_") } @$srpms;
 
+	# Skip this media if the package is already building as noarch for it or
+	# already done.
+	next if $pkg_tree{$prefix}{media}{$media}{arch}{noarch};
+	next if $pkg_tree{$prefix}{media}{$media}{done_arch}{noarch};
+
 	my $arch_list = find { ref($_) eq 'ARRAY' } $config->{arch}, (ref($config->{arch}) eq 'HASH' ? ($config->{arch}{$target}, $config->{arch}{default}) : ());
 	my @arch_list = $arch_list ? @$arch_list : keys %{$config->{bot}};
 	# need to find a bot for each arch
 	foreach my $arch (@arch_list) {
-	    # Skip this arch if the package is already building as noarch or for this arch
-	    # or if it should not be built on this arch or it has already failed or succeeded
-	    next if $pkg_tree{$prefix}{media}{$media}{arch}{noarch};
+	    # Skip this arch if the package is already building for it or if it
+	    # should not be built on this arch or it has already failed or
+	    # succeeded.
 	    next if $pkg_tree{$prefix}{media}{$media}{arch}{$arch};
 	    next if $pkg_tree{$prefix}{media}{$media}{done_arch}{$arch};
 	    next if $pkg_tree{$prefix}{media}{$media}{excluded_arch}{$arch};