From a04fa2d3f724847222525407b31f22404ec0012e Mon Sep 17 00:00:00 2001 From: Pascal Terjan Date: Fri, 20 Jan 2023 00:05:18 +0000 Subject: Small cleanups --- iurt | 2 +- lib/Iurt/Urpmi.pm | 8 ++------ 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/iurt b/iurt index 38a835d..21a436d 100755 --- a/iurt +++ b/iurt @@ -795,7 +795,7 @@ retry: return $srpm; } - $ok = $urpmi->install_dynamic_buildrequires(\%run, $config, $chroot_tmp, '', $luser, $spec, $srpm); + $ok = $urpmi->install_dynamic_buildrequires(\%run, $config, $chroot_tmp, $luser, $spec, $srpm); if (!$ok) { $run{status}{$srpm} ||= 'install_deps_failure'; return $srpm; diff --git a/lib/Iurt/Urpmi.pm b/lib/Iurt/Urpmi.pm index aec4f87..2343ee8 100644 --- a/lib/Iurt/Urpmi.pm +++ b/lib/Iurt/Urpmi.pm @@ -555,7 +555,7 @@ sub recreate_srpm { # return ("exit_code", srpm, spec) sub install_dynamic_buildrequires { - my ($self, $run, $config, $chroot_tmp, $dir, $luser, $spec, $srpm) = @_; + my ($self, $run, $config, $chroot_tmp, $luser, $spec, $srpm) = @_; my $program_name = $run->{program_name}; my $with_flags = $run->{with_flags}; @@ -587,11 +587,7 @@ sub install_dynamic_buildrequires { my $ret = perform_command(qq(chroot $chroot_tmp su $luser -c "rpmbuild -br $with_flags /home/$luser/rpmbuild/SPECS/$spec"), $run, $config, use_iurt_root_command => 1, - mail => $config->{admin}, - error => "[DYNAMIC BUILDREQUIRES] cannot create $srpm in $chroot_tmp", - debug_mail => $run->{debug}, - hash => "generatebuildrequires_$srpm", - error_ok => [11] + hash => "generatebuildrequires_$srpm" ); return 1 if $ret; -- cgit v1.2.1