aboutsummaryrefslogtreecommitdiffstats
path: root/URPM
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2008-07-07 14:08:58 +0000
committerPascal Rigaux <pixel@mandriva.com>2008-07-07 14:08:58 +0000
commit078e57da51845413408d1a0a69fc68777bad8232 (patch)
tree3cbb026e295311fb70005b40ede59ea39e7764d5 /URPM
parentfaba26647a5cbc07e8d303967ebf73742c480c9a (diff)
downloadperl-URPM-078e57da51845413408d1a0a69fc68777bad8232.tar
perl-URPM-078e57da51845413408d1a0a69fc68777bad8232.tar.gz
perl-URPM-078e57da51845413408d1a0a69fc68777bad8232.tar.bz2
perl-URPM-078e57da51845413408d1a0a69fc68777bad8232.tar.xz
perl-URPM-078e57da51845413408d1a0a69fc68777bad8232.zip
- revert change introduced in 3.16 (it breaks too much, eg
superuser--priority-upgrade.t test case), and introduce $state->{rejected_already_installed} instead
Diffstat (limited to 'URPM')
-rw-r--r--URPM/Resolve.pm2
1 files changed, 1 insertions, 1 deletions
diff --git a/URPM/Resolve.pm b/URPM/Resolve.pm
index 61429c2..8c58c63 100644
--- a/URPM/Resolve.pm
+++ b/URPM/Resolve.pm
@@ -680,7 +680,7 @@ sub _set_rejected_old_package {
my ($state, $pkg, $new_pkg) = @_;
if ($pkg->fullname eq $new_pkg->fullname) {
- $state->{rejected}{$pkg->fullname}{installed} = 1;
+ $state->{rejected_already_installed}{$pkg->id} = $pkg;
} else {
push @{$state->{rejected}{$pkg->fullname}{backtrack}{keep}}, scalar $new_pkg->fullname;
}