diff options
author | Pascal Terjan <pterjan@mageia.org> | 2023-01-30 20:40:22 +0000 |
---|---|---|
committer | Pascal Terjan <pterjan@mageia.org> | 2023-01-30 20:40:22 +0000 |
commit | 05587ac278fc2d0204cd10439274acbad6e0112b (patch) | |
tree | c0ebaa11e0912df4b0f244bb996ab3bed95a4d51 | |
parent | d859e7f4012097a3edbe30a365a946c0abe50d64 (diff) | |
download | iurt-05587ac278fc2d0204cd10439274acbad6e0112b.tar iurt-05587ac278fc2d0204cd10439274acbad6e0112b.tar.gz iurt-05587ac278fc2d0204cd10439274acbad6e0112b.tar.bz2 iurt-05587ac278fc2d0204cd10439274acbad6e0112b.tar.xz iurt-05587ac278fc2d0204cd10439274acbad6e0112b.zip |
Fix some forever retries
An error was not set when failing in %prep or %generate_buildrequires
while trying to generate dynamic buildrequires. This causes iurt to
assume it's a retriable install_deps_failure.
Set the failure to build_failure when what fails is rpmbuild -br
rather than installing the packages.
-rw-r--r-- | NEWS | 3 | ||||
-rw-r--r-- | lib/Iurt/Urpmi.pm | 2 |
2 files changed, 4 insertions, 1 deletions
@@ -2,6 +2,9 @@ - Add some tests checking the syntax of iurt/ulri/emi as the main scripts are not covered by test. - ulri: Fix syntax +- iurt: Fix build system retrying forever when rpmbuild -br fails to compute + dynamic BuildRequires, for example because some BuildRequires used in %prep + are missing. 0.8.1 - iurt: Fix getting a retriable install_deps_failure instead of missing_dep diff --git a/lib/Iurt/Urpmi.pm b/lib/Iurt/Urpmi.pm index 49025d8..53d0756 100644 --- a/lib/Iurt/Urpmi.pm +++ b/lib/Iurt/Urpmi.pm @@ -584,7 +584,6 @@ sub install_dynamic_buildrequires { use_iurt_root_command => 1, hash => "generatebuildrequires_$srpm" ); - return 1 if $ret; # Unfortunately iurt_root_command hides the original error code so @@ -611,6 +610,7 @@ sub install_dynamic_buildrequires { } else { # This was a failure for another reason, no point retrying plog('ERROR', "Failed to generate dynamic BuildRequires."); + $run->{status}{$srpm} = 'build_failure'; return 0; } } |