diff options
author | Pascal Terjan <pterjan@mageia.org> | 2022-05-01 16:30:13 +0000 |
---|---|---|
committer | Pascal Terjan <pterjan@mageia.org> | 2022-05-01 17:00:28 +0000 |
commit | 229063299505e1365d389d5324714d56db7e09cd (patch) | |
tree | 3421cdea762a9537815418f1a38069e5cd08e7d5 | |
parent | 84b709bad5d60a0da907e1db6036e89db6ef20da (diff) | |
download | iurt-229063299505e1365d389d5324714d56db7e09cd.tar iurt-229063299505e1365d389d5324714d56db7e09cd.tar.gz iurt-229063299505e1365d389d5324714d56db7e09cd.tar.bz2 iurt-229063299505e1365d389d5324714d56db7e09cd.tar.xz iurt-229063299505e1365d389d5324714d56db7e09cd.zip |
iurt: Use consistent log directory
This never worked on the Mageia buildsystem where $log_dir is not
directly $srpm which happens when there is a @...: prefix but
commit dcba2bd9a3d11a0f means the failure to write is now detected
and causes a crash.
-rwxr-xr-x | iurt | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -861,7 +861,7 @@ retry: if ($config->{check_binary_file}) { $urpmi->install_packages($srpm, $chroot_tmp, $local_spool, 'binary_test', "[REBUILD] binaries packages generated from $srpm do not install correctly", { maintainer => $maintainer } ,@packages) or return $srpm; } else { - my $successfile = "$local_spool/log/$srpm/binary_test_$srpm-1.log"; + my $successfile = "$log_dir/binary_test_$srpm-1.log"; output($successfile, "$srpm build ok"); } @@ -877,7 +877,7 @@ retry: } else { # drop packages and logs if we only want failure logs if ($run{delete_on_success}) { - system("rm -rf $local_spool/log/$srpm/"); + system("rm -rf $log_dir"); } elsif (!$run{discard_packages}) { plog('OK', "build successful, copying packages to $local_spool."); if (system("cp $chroot_tmp/home/$luser/rpmbuild/RPMS/*/*.rpm $local_spool &>/dev/null")) { @@ -888,7 +888,7 @@ retry: unlink "$local_spool/$package"; } } else { - my $packagesfile = "$local_spool/log/$srpm/packages.$run{my_arch}.$run{run}.log"; + my $packagesfile = "$log_dir/packages.$run{my_arch}.$run{run}.log"; output($packagesfile, map { m|([^/]*)$|; "$1\n" } @packages); } } |