aboutsummaryrefslogtreecommitdiffstats
path: root/URPM
diff options
context:
space:
mode:
authorChristophe Fergeau <cfergeau@mandriva.com>2009-07-28 13:12:01 +0000
committerChristophe Fergeau <cfergeau@mandriva.com>2009-07-28 13:12:01 +0000
commit12bdae7779a82ecf0d9aceb1f7ec03a4c5f98dc1 (patch)
tree8bfc5008087d65ef26430eed6b27c7565311dafe /URPM
parent60bb91532ae971221aae22da36dd6f981936a63e (diff)
downloadperl-URPM-12bdae7779a82ecf0d9aceb1f7ec03a4c5f98dc1.tar
perl-URPM-12bdae7779a82ecf0d9aceb1f7ec03a4c5f98dc1.tar.gz
perl-URPM-12bdae7779a82ecf0d9aceb1f7ec03a4c5f98dc1.tar.bz2
perl-URPM-12bdae7779a82ecf0d9aceb1f7ec03a4c5f98dc1.tar.xz
perl-URPM-12bdae7779a82ecf0d9aceb1f7ec03a4c5f98dc1.zip
keep track of sources for obsoleted/removed levels
Patch by Anssi Hannula, fixes bug #50666 removed/obsoleted levels are set in set_rejected() when a package is rejected (i.e. removed) or a rejection reason is added. They keep track on whether the package is removed and/or obsoleted. When the package has both flags and one of the rejection reasons is removed by _remove_rejected_from(), appropriate flags do not get removed. The case I encountered: the package is set for removal when a package it depends on fails upgrade due to unsatisfied dependency and has to be removed (backtrack_selected => resolve_rejected, causing removed=1), and the package is then promoted (causing obsoleted=1). However, the promotion fails due to the same unsatisfied dependency and backtrack_selected => disable_selected_and_unrequested_dependencies => disable_selected => _remove_all_rejected_from => _remove_rejected_from gets called. This removes the latter rejection reason, but leaves flags, including the now wrong obsoleted=1. Thus the package is not explicitely removed as an obsoletion is assumed, therefore failing the transaction.
Diffstat (limited to 'URPM')
-rw-r--r--URPM/Resolve.pm17
1 files changed, 15 insertions, 2 deletions
diff --git a/URPM/Resolve.pm b/URPM/Resolve.pm
index d12aa91..801929b 100644
--- a/URPM/Resolve.pm
+++ b/URPM/Resolve.pm
@@ -682,6 +682,14 @@ sub _remove_rejected_from {
my ($state, $fullname, $from_fullname) = @_;
my $rv = $state->{rejected}{$fullname} or return;
+
+ foreach (qw(removed obsoleted)) {
+ if (exists $rv->{$_} && exists $rv->{$_}{$from_fullname}) {
+ delete $rv->{$_}{$from_fullname};
+ delete $rv->{$_} if !%{$rv->{$_}};
+ }
+ }
+
exists $rv->{closure}{$from_fullname} or return;
delete $rv->{closure}{$from_fullname};
if (%{$rv->{closure}}) {
@@ -756,8 +764,13 @@ sub set_rejected {
#- set removed and obsoleted level.
foreach (qw(removed obsoleted)) {
- $rdep->{$_} && (! exists $rv->{$_} || $rdep->{$_} <= $rv->{$_})
- and $rv->{$_} = $rdep->{$_};
+ if ($rdep->{$_}) {
+ if ($rdep->{from}) {
+ $rv->{$_}{scalar $rdep->{from}->fullname} = undef;
+ } else {
+ $rv->{$_}{asked} = undef;
+ }
+ }
}
$newly_rejected;