diff options
| author | Pascal Terjan <pterjan@mageia.org> | 2023-01-20 00:05:18 +0000 |
|---|---|---|
| committer | Pascal Terjan <pterjan@mageia.org> | 2023-01-20 00:05:18 +0000 |
| commit | a04fa2d3f724847222525407b31f22404ec0012e (patch) | |
| tree | 9dacf1ab4c72b3ce83269a22df6cd9c5c357f7f8 | |
| parent | fff6b7df49063a3f7cbd42c2c2f87a9b6563cab2 (diff) | |
| download | iurt-a04fa2d3f724847222525407b31f22404ec0012e.tar iurt-a04fa2d3f724847222525407b31f22404ec0012e.tar.gz iurt-a04fa2d3f724847222525407b31f22404ec0012e.tar.bz2 iurt-a04fa2d3f724847222525407b31f22404ec0012e.tar.xz iurt-a04fa2d3f724847222525407b31f22404ec0012e.zip | |
Small cleanups
| -rwxr-xr-x | iurt | 2 | ||||
| -rw-r--r-- | lib/Iurt/Urpmi.pm | 8 |
2 files changed, 3 insertions, 7 deletions
@@ -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; |