From b80458f48eeab1469d48fa334e5fafa218536ff2 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Mon, 15 Oct 2018 01:34:47 +0200 Subject: remove unused parameter --- lib/Iurt/Emi.pm | 2 +- lib/Iurt/Queue.pm | 6 +++--- ulri | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/Iurt/Emi.pm b/lib/Iurt/Emi.pm index f7a76fb..851307c 100644 --- a/lib/Iurt/Emi.pm +++ b/lib/Iurt/Emi.pm @@ -186,7 +186,7 @@ sub upload_prefix_in_media { unlink(@packages, @duplicate_packages); # unlink the sources rpm unless some non mandatory arch still need to be done - if (check_if_all_archs_processed($media, $prefix, $pkg_tree->{$prefix}, $config)) { + if (check_if_all_archs_processed($media, $pkg_tree->{$prefix}, $config)) { foreach (@{$pkg_tree->{$prefix}{srpms}}) { plog('DEBUG', "unlink $todo$path/${prefix}_$_"); unlink("$todo$path/${prefix}_$_"); diff --git a/lib/Iurt/Queue.pm b/lib/Iurt/Queue.pm index 449ec36..7cbc991 100644 --- a/lib/Iurt/Queue.pm +++ b/lib/Iurt/Queue.pm @@ -56,7 +56,7 @@ sub apply_to_upload_tree { } sub check_if_mandatory_arch_failed { - my ($media, $prefix, $ent, $config) = @_; + my ($media, $ent, $config) = @_; my $mandatory_arch = get_mandatory_arch($config, $ent->{target}); foreach my $arch (@$mandatory_arch) { return 1 if $ent->{media}{$media}{failed_arch}{$arch}; @@ -64,7 +64,7 @@ sub check_if_mandatory_arch_failed { } sub check_if_all_archs_processed { - my ($media, $prefix, $ent, $config) = @_; + my ($media, $ent, $config) = @_; return 1 if $ent->{media}{$media}{done_arch}{noarch}; return 1 if $ent->{media}{$media}{failed_arch}{noarch}; my $arch_list = get_target_arch($config, $ent->{target}); @@ -112,7 +112,7 @@ sub cleanup_failed_build { # keep rpms for other architectures $ent->{rpms} = $kept_rpms; # but delete src.rpm if we are now done - if (check_if_all_archs_processed($media, $prefix, $ent, $config)) { + if (check_if_all_archs_processed($media, $ent, $config)) { foreach my $srpm (@{$ent->{srpms}}) { my $file = "$todo_dir/${prefix}_$srpm"; plog('DEBUG', "moving $file to $fail_dir/"); diff --git a/ulri b/ulri index 745ae65..ff1f76d 100755 --- a/ulri +++ b/ulri @@ -298,7 +298,7 @@ foreach my $prefix (keys %pkg_tree) { unless ($timeout || $zombie || $ended) { # Everything is fine, build is continuing! # Kill it if that package had failed on a mandatory arch - if (check_if_mandatory_arch_failed($media, $prefix, $ent, $config)) { + if (check_if_mandatory_arch_failed($media, $ent, $config)) { ssh($remote, "kill -14 $pid"); } next bot; @@ -388,7 +388,7 @@ foreach my $prefix (keys %pkg_tree) { next if $error; if ($done) { - if (check_if_mandatory_arch_failed($media, $prefix, $ent, $config)) { + if (check_if_mandatory_arch_failed($media, $ent, $config)) { # Discard this arch as another mandatory one failed cleanup_failed_build($todo_dir, $done_dir, $fail_dir, $prefix, $ent, $media, $arch, $config); } else { -- cgit v1.2.1