From aac1c9c28c89f310c6f657d0adc435f388d1c54e Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Sat, 19 Dec 2020 21:06:36 +0100 Subject: simplify previous commit --- iurt | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/iurt b/iurt index 6d0f536..a9300a7 100755 --- a/iurt +++ b/iurt @@ -803,10 +803,7 @@ retry: debug_mail => $run{debug}, log => $log_dir); # or next; As this failed quite often, do not stop plog('NOTIFY', "Building $srpm"); - my $target_arch = $run{my_arch}; - if (check_noarch("$path_srpm/$srpm")) { - $target_arch = 'noarch'; - } + my $target_arch = check_noarch("$path_srpm/$srpm") ? 'noarch' : $run{my_arch}; my $command = "rpmbuild --target $target_arch --rebuild $run{with_flags} /home/$luser/rpmbuild/SRPMS/$srpm"; if ($run{stop}) { $urpmi->install_packages('chroot', $chroot_tmp, $local_spool, 'configure', "[ADMIN] installation of urpmi and sudo failed in the chroot $run{my_arch}", { check => 1, maintainer => $config->{admin} }, 'urpmi', 'sudo'); -- cgit v1.2.1