summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mageia.org>2012-01-06 19:44:00 +0000
committerThierry Vignaud <tv@mageia.org>2012-01-06 19:44:00 +0000
commit7071e2acea4052ae587f8eba015900d290c946bd (patch)
tree2a70713242f0bf835dd72bb3b5e780de2a722d11
parent301ab0a298cc5e0ef4033546a65ed40a7484aec5 (diff)
downloadurpmi-7071e2acea4052ae587f8eba015900d290c946bd.tar
urpmi-7071e2acea4052ae587f8eba015900d290c946bd.tar.gz
urpmi-7071e2acea4052ae587f8eba015900d290c946bd.tar.bz2
urpmi-7071e2acea4052ae587f8eba015900d290c946bd.tar.xz
urpmi-7071e2acea4052ae587f8eba015900d290c946bd.zip
(conflicting_packages_msg_) kill unused args
-rw-r--r--urpm/select.pm4
-rwxr-xr-xurpmi2
2 files changed, 3 insertions, 3 deletions
diff --git a/urpm/select.pm b/urpm/select.pm
index 11e36e56..133eb274 100644
--- a/urpm/select.pm
+++ b/urpm/select.pm
@@ -605,7 +605,7 @@ sub rejected_unsatisfied {
}
sub conflicting_packages_msg_ {
- my ($_urpm, $_state, $removed_packages_msgs) = @_;
+ my ($removed_packages_msgs) = @_;
my $list = join("\n", @$removed_packages_msgs) or return;
@$removed_packages_msgs == 1 ?
@@ -614,7 +614,7 @@ sub conflicting_packages_msg_ {
}
sub conflicting_packages_msg {
my ($urpm, $state) = @_;
- conflicting_packages_msg_($urpm, $state, [ removed_packages_msgs($urpm, $state) ]);
+ conflicting_packages_msg_([ removed_packages_msgs($urpm, $state) ]);
}
sub removed_packages_msgs {
diff --git a/urpmi b/urpmi
index 69d84ea0..7c6aa045 100755
--- a/urpmi
+++ b/urpmi
@@ -556,7 +556,7 @@ have to be removed for others to be upgraded:\n%s\n", $list);
exit 0;
}
- my $msg = urpm::select::conflicting_packages_msg_($urpm, $state, \@conflicting_pkgs_msgs);
+ my $msg = urpm::select::conflicting_packages_msg_(\@conflicting_pkgs_msgs);
if ($test) {
$msg = "$msg\n" . N("(test only, removal will not be actually done)");
}