Mageia Bugzilla – Attachment 10251 Details for
Bug 23223
During upgrade of mga5/kde4 system to mga6, many conflicts occur due to selection of obsolete kde-l10n package
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
Log In
[x]
|
New Account
|
Forgot Password
Suggested fix
0001-Don-t-select-an-obsolete-package-to-resolve-dependen.patch (text/plain), 1.31 KB, created by
Martin Whitaker
on 2018-06-24 23:08:51 CEST
(
hide
)
Description:
Suggested fix
Filename:
MIME Type:
Creator:
Martin Whitaker
Created:
2018-06-24 23:08:51 CEST
Size:
1.31 KB
patch
obsolete
>From 752f150598280a08c8a40796d703e4132891e666 Mon Sep 17 00:00:00 2001 >From: Martin Whitaker <mageia@martin-whitaker.me.uk> >Date: Sun, 24 Jun 2018 22:03:48 +0100 >Subject: [PATCH] Don't select an obsolete package to resolve > dependencies/conflicts (mga#23223) > > >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); >-- >2.13.7 >
From 752f150598280a08c8a40796d703e4132891e666 Mon Sep 17 00:00:00 2001 From: Martin Whitaker <mageia@martin-whitaker.me.uk> Date: Sun, 24 Jun 2018 22:03:48 +0100 Subject: [PATCH] Don't select an obsolete package to resolve dependencies/conflicts (mga#23223) 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); -- 2.13.7
View Attachment As Raw
Actions:
View
Attachments on
bug 23223
: 10251