Fix a regression (introduced in urpm.pm revision 1.579) : the packages that

obsoleted older packages were installed as 'install', not as 'upgrade', thus
rpm wasn't attempting to deinstall the old package.

3 files changed, 5 insertions, 3 deletions

diff --git a/gurpmi2 b/gurpmi2
index 7bf19f71..125bcb0b 100755
--- a/gurpmi2
+++ b/gurpmi2
@@ -240,7 +240,7 @@ sub do_install_3 () {
 		sync();
 	    },
 	);
-	my %transaction_sources_install = %{$urpm->extract_packages_to_install(\%transaction_sources) || {}};
+	my %transaction_sources_install = %{$urpm->extract_packages_to_install(\%transaction_sources, $state) || {}};
 	if (!$urpm->{options}{'verify-rpm'} || grep { $_->{'verify-rpm'} } @{$urpm->{media}}) {
 	    my @bad_signatures = $urpm->check_sources_signatures(\%transaction_sources_install, \%transaction_sources, translate => 1);
 	    if (@bad_signatures) {
diff --git a/urpm.pm b/urpm.pm
index 6dbdf825..87d9245d 100644
--- a/urpm.pm
+++ b/urpm.pm
@@ -2893,12 +2893,14 @@ sub prepare_transaction {
 #- extract package that should be installed instead of upgraded,
 #- sources is a hash of id -> source rpm filename.
 sub extract_packages_to_install {
-    my ($urpm, $sources) = @_;
+    my ($urpm, $sources, $state) = @_;
     my %inst;
+    my $rej = ref $state ? $state->{rejected} || {} : {};
 
     foreach (keys %$sources) {
 	my $pkg = $urpm->{depslist}[$_] or next;
 	$pkg->flag_disable_obsolete || !$pkg->flag_installed
+	    and !grep { exists $rej->{$_}{closure}{$pkg->fullname} } keys %$rej
 	    and $inst{$pkg->id} = delete $sources->{$pkg->id};
     }
 
diff --git a/urpmi b/urpmi
index ee0cf17a..500b79a7 100755
--- a/urpmi
+++ b/urpmi
@@ -577,7 +577,7 @@ foreach my $set (@{$state->{transaction} || []}) {
 	    goto &urpm::download::sync_logger;
 	},
     );
-    my %transaction_sources_install = %{$urpm->extract_packages_to_install(\%transaction_sources) || {}};
+    my %transaction_sources_install = %{$urpm->extract_packages_to_install(\%transaction_sources, $state) || {}};
 
     if (!$force && ($urpm->{options}{'verify-rpm'} || grep { $_->{'verify-rpm'} } @{$urpm->{media}})) {
 	my @bad_signatures = $urpm->check_sources_signatures(\%transaction_sources_install, \%transaction_sources, translate => 1);