From da6cfc1161f8bde5379fafd58296bd0a1f96698a Mon Sep 17 00:00:00 2001 From: Martin Whitaker Date: Sun, 24 Jun 2018 22:03:48 +0100 Subject: Don't select an obsolete package to resolve dependencies/conflicts (mga#23223) --- NEWS | 3 +++ URPM/Resolve.pm | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/NEWS b/NEWS index ebf9612..7987b5a 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,6 @@ +- Don't select an obsolete package to resolve dependencies/conflicts + (mga#23223) + Version 5.17 - 14 June 2018 - fix finding better pkg (mga#23037) diff --git a/URPM/Resolve.pm b/URPM/Resolve.pm index 7b3b1e3..55f5c64 100644 --- a/URPM/Resolve.pm +++ b/URPM/Resolve.pm @@ -1502,6 +1502,8 @@ sub _handle_diff_provides { $_->obsoletes_overlap($p->name . " == " . $p->epoch . ":" . $p->version . "-" . $p->release)) && (!strict_arch($urpm) || strict_arch_check($p, $_)); } @packages; + #- don't promote an obsolete package (mga#23223) + @packages = grep { _find_packages_obsoleting($urpm, $state, $_) == 0 } @packages; if (!@packages) { @packages = _find_packages_obsoleting($urpm, $state, $p); @@ -1559,6 +1561,8 @@ sub _handle_conflict { $p->version . "-" . $p->release; my @packages = grep { $_->name eq $p->name } find_candidate_packages($urpm, $need_deps, $state->{rejected}); @packages = grep { ! $_->provides_overlap($property) } @packages; + #- don't promote an obsolete package (mga#23223) + @packages = grep { _find_packages_obsoleting($urpm, $state, $_) == 0 } @packages; if (!@packages) { @packages = _find_packages_obsoleting($urpm, $state, $p); -- cgit v1.2.1