diff options
author | Pascal Rigaux <pixel@mandriva.com> | 2008-07-07 14:11:05 +0000 |
---|---|---|
committer | Pascal Rigaux <pixel@mandriva.com> | 2008-07-07 14:11:05 +0000 |
commit | 33e56eeb13ba2fe58ee4aa38bc5dc2124888b94a (patch) | |
tree | 3fc9674255584e5858435acc6d570ad0b6ce28be | |
parent | 9884b05a9a7ebd412b33134e10b1b91ce575e5b5 (diff) | |
download | urpmi-33e56eeb13ba2fe58ee4aa38bc5dc2124888b94a.tar urpmi-33e56eeb13ba2fe58ee4aa38bc5dc2124888b94a.tar.gz urpmi-33e56eeb13ba2fe58ee4aa38bc5dc2124888b94a.tar.bz2 urpmi-33e56eeb13ba2fe58ee4aa38bc5dc2124888b94a.tar.xz urpmi-33e56eeb13ba2fe58ee4aa38bc5dc2124888b94a.zip |
what was introduced in perl-URPM 3.16 to get "rejected already installed pkgs"
is wrong. Adapt to perl-URPM 3.18 way ($state->{rejected_already_installed})
which ensures we don't break things (eg: superuser--priority-upgrade.t test case)
-rw-r--r-- | NEWS | 2 | ||||
-rw-r--r-- | urpm/select.pm | 3 |
2 files changed, 2 insertions, 3 deletions
@@ -11,7 +11,7 @@ and are fatal errors unless the user wants to go on anyway (or --force) o display a message "Package foo is already installed" when asking "urpmi foo bar" and only installing bar (#41593) - (requires perl-URPM 3.16) + (requires perl-URPM 3.18) o set connection timeout for rsync as well (Anssi) o fix --replacepkgs when a same package appears more than once in urpmi db o fix displaying "files are missing" (regression introduced in 5.6) diff --git a/urpm/select.pm b/urpm/select.pm index e9c61fdf..495e81c7 100644 --- a/urpm/select.pm +++ b/urpm/select.pm @@ -527,7 +527,7 @@ sub unselected_packages { #- misc functions to help finding ask_unselect and ask_remove elements with their reasons translated. sub already_installed { my ($state) = @_; - grep { $state->{rejected}{$_}{installed} } keys %{$state->{rejected} || {}}; + map { scalar $_->fullname } values %{$state->{rejected_already_installed} || {}}; } sub translate_already_installed { @@ -565,7 +565,6 @@ sub translate_why_unselected_one { } @unsatisfied)), $rb->{promote} && !$rb->{keep} ? N("trying to promote %s", join(", ", @{$rb->{promote}})) : (), $rb->{keep} ? N("in order to keep %s", join(", ", @{$rb->{keep}})) : (), - $rb->{installed} ? "already installed" : (), ); $fullname . ($s ? " ($s)" : ''); } |