diff options
author | Thierry Vignaud <thierry.vignaud@gmail.com> | 2020-12-19 21:06:36 +0100 |
---|---|---|
committer | Thierry Vignaud <thierry.vignaud@gmail.com> | 2020-12-19 21:06:45 +0100 |
commit | aac1c9c28c89f310c6f657d0adc435f388d1c54e (patch) | |
tree | b79a975f9bfdc18ddffd65a80c1a2fd63dea53e5 | |
parent | 5c49093b5545aecb2f29461ea49f7c4ee4ef40cd (diff) | |
download | iurt-aac1c9c28c89f310c6f657d0adc435f388d1c54e.tar iurt-aac1c9c28c89f310c6f657d0adc435f388d1c54e.tar.gz iurt-aac1c9c28c89f310c6f657d0adc435f388d1c54e.tar.bz2 iurt-aac1c9c28c89f310c6f657d0adc435f388d1c54e.tar.xz iurt-aac1c9c28c89f310c6f657d0adc435f388d1c54e.zip |
simplify previous commit
-rwxr-xr-x | iurt | 5 |
1 files changed, 1 insertions, 4 deletions
@@ -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'); |