summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrancois Pons <fpons@mandriva.com>2003-09-10 15:17:07 +0000
committerFrancois Pons <fpons@mandriva.com>2003-09-10 15:17:07 +0000
commitb141a56158c6255ff7614fa1ce05b4266c5838b6 (patch)
treecb2341b9077ea32d0d4b27b01675d76e2b21b84a
parent0e205ce9eaaf78f5517478dff9bf96bfe7a6de2d (diff)
downloadurpmi-b141a56158c6255ff7614fa1ce05b4266c5838b6.tar
urpmi-b141a56158c6255ff7614fa1ce05b4266c5838b6.tar.gz
urpmi-b141a56158c6255ff7614fa1ce05b4266c5838b6.tar.bz2
urpmi-b141a56158c6255ff7614fa1ce05b4266c5838b6.tar.xz
urpmi-b141a56158c6255ff7614fa1ce05b4266c5838b6.zip
fixed to display only once skipping or installing log.
-rw-r--r--urpm.pm10
1 files changed, 7 insertions, 3 deletions
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)));
});
}