diff options
-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', |