From b141a56158c6255ff7614fa1ce05b4266c5838b6 Mon Sep 17 00:00:00 2001 From: Francois Pons Date: Wed, 10 Sep 2003 15:17:07 +0000 Subject: fixed to display only once skipping or installing log. --- urpm.pm | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'urpm.pm') diff --git a/urpm.pm b/urpm.pm index 25dae534..4a0651e6 100644 --- a/urpm.pm +++ b/urpm.pm @@ -865,16 +865,20 @@ sub configure { } #- determine package to withdraw (from skip.list file) only if something should be withdrawn. unless ($options{noskipping}) { + my %uniq; $urpm->compute_flags($urpm->get_packages_list($urpm->{skiplist}, $options{skip}), skip => 1, callback => sub { my ($urpm, $pkg) = @_; - $pkg->is_arch_compat or return; - $urpm->{error}(N("skipping package %s", scalar($pkg->fullname))); + $pkg->is_arch_compat && ! exists $uniq{$pkg->fullname} or return; + $uniq{$pkg->fullname} = undef; + $urpm->{log}(N("skipping package %s", scalar($pkg->fullname))); }); } unless ($options{noinstalling}) { + my %uniq; $urpm->compute_flags($urpm->get_packages_list($urpm->{instlist}, $options{inst}), disable_obsolete => 1, callback => sub { my ($urpm, $pkg) = @_; - $pkg->is_arch_compat or return; + $pkg->is_arch_compat && ! exists $uniq{$pkg->fullname} or return; + $uniq{$pkg->fullname} = undef; $urpm->{log}(N("would install instead of upgrade package %s", scalar($pkg->fullname))); }); } -- cgit v1.2.1