diff options
| -rw-r--r-- | urpm.pm | 2 | ||||
| -rwxr-xr-x | urpmi | 8 | ||||
| -rw-r--r-- | urpmi.spec | 4 |
3 files changed, 6 insertions, 8 deletions
@@ -1478,7 +1478,7 @@ sub update_media { unlink "$urpm->{cachedir}/partial/$basename"; } } - + if (-s "$urpm->{cachedir}/partial/$basename" > 32) { $options{callback} && $options{callback}('done', $medium->{name}); $urpm->{log}(N("...retrieving done")); @@ -409,21 +409,17 @@ if (@ask_unselect) { } } -foreach (sort { $a cmp $b } keys %{$state->{rejected} || {}}) { - my $v = $state->{rejected}{$_}; - print STDERR "<<$_>> removed=$v->{removed}, obsoleted=$v->{obsoleted}, size=$v->{size};\n"; -} my @ask_remove = grep { $state->{rejected}{$_}{removed} && !$state->{rejected}{$_}{obsoleted} } keys %{$state->{rejected} || {}}; if (@ask_remove) { unless ($auto) { my $list = join "\n", map { my ($from) = keys %{$state->{rejected}{$_}{closure}}; my ($whyk) = keys %{$state->{rejected}{$_}{closure}{$from}}; my ($whyv) = $state->{rejected}{$_}{closure}{$from}{$whyk}; - my $frompkg = $urpm->{depslist}[$from]; + my $frompkg = $urpm->search($from, strict_fullname => 1); my $s; for ($whyk) { /old_requested/ and - $s .= N("in order to install %s", $frompkg ? $frompkg->fullname : $from); + $s .= N("in order to install %s", $frompkg ? scalar $frompkg->fullname : $from); /unsatisfied/ and do { foreach (@$whyv) { $s and $s .= ', '; @@ -2,7 +2,7 @@ Name: urpmi Version: 4.3 -Release: 12mdk +Release: 13mdk License: GPL Source0: %{name}.tar.bz2 Source1: %{name}.logrotate @@ -202,10 +202,12 @@ $urpm->update_media; %changelog +* Thu Jun 5 2003 François Pons <fpons@mandrakesoft.com> 4.3-13mdk - added patch from Michaël Scherer to add --no-uninstall (or --no-remove) and assume no by default when asking to remove packages. - updated urpmq with newer perl-URPM 0.90-4mdk and better. +- fixed bad display of old package installation reason. * Mon May 26 2003 François Pons <fpons@mandrakesoft.com> 4.3-12mdk - updated for newer perl-URPM 0.90 series. |