diff options
| author | Pascal Terjan <pterjan@mageia.org> | 2023-01-20 19:45:49 +0000 |
|---|---|---|
| committer | Pascal Terjan <pterjan@mageia.org> | 2023-01-20 19:45:49 +0000 |
| commit | b61b6a805db8454d83d33b5acd2af2ac0d0a326e (patch) | |
| tree | f3114bf40649f199468f3fa9341705eea0a6de81 | |
| parent | 6877e5fc2846c54c6739ecbdd779d7e6092154fb (diff) | |
| download | iurt-b61b6a805db8454d83d33b5acd2af2ac0d0a326e.tar iurt-b61b6a805db8454d83d33b5acd2af2ac0d0a326e.tar.gz iurt-b61b6a805db8454d83d33b5acd2af2ac0d0a326e.tar.bz2 iurt-b61b6a805db8454d83d33b5acd2af2ac0d0a326e.tar.xz iurt-b61b6a805db8454d83d33b5acd2af2ac0d0a326e.zip | |
iurt: Fix detection of missing_dep on DynamicBuildRequires
Currently we always get install_deps_failure which is retriable.
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | lib/Iurt/Urpmi.pm | 4 |
2 files changed, 3 insertions, 3 deletions
@@ -1,3 +1,5 @@ +- iurt: Fix getting a retriable install_deps_failure instead of missing_dep + when some DynamicBuildRequires can't be resolved. - iurt: Fix buildreqs.nosrc.rpm filename on Mageia build system 0.8.0 diff --git a/lib/Iurt/Urpmi.pm b/lib/Iurt/Urpmi.pm index 62156e3..49025d8 100644 --- a/lib/Iurt/Urpmi.pm +++ b/lib/Iurt/Urpmi.pm @@ -334,8 +334,6 @@ sub _install_callback { # it seems the is needed urpmi error is due to something else (likely a # database corruption error). # my @missing_deps = $output =~ /(?:(\S+) is needed by )|(?:\(due to unsatisfied ([^[ ]*)(?: (.*)|\[(.*)\])?\))/g; - # - my @missing_deps = $output =~ /([^ \n]+) \(due to unsatisfied ([^[ \n]*)(?: ([^\n]*)|\[([^\n]*)\])?\)/g; # <mrl> 20071106 FIXME: This should not be needed anymore @@ -596,7 +594,7 @@ sub install_dynamic_buildrequires { plog("INFO: Some dynamic BuildRequires are missing"); my @packages = ("$chroot_tmp/home/$luser/rpmbuild/SRPMS/$nosrc"); if (!$self->install_packages( - $nosrc, + $srpm, $chroot_tmp, $run->{local_spool}, 'dynamic_buildrequires', |