summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mageia.org>2012-08-31 16:45:37 +0000
committerThierry Vignaud <tv@mageia.org>2012-08-31 16:45:37 +0000
commitdf40b76b3cc3d1d743bda28406e8bec3c4873ebd (patch)
tree21f7c6ea72774724d9f63a8be32f2cba115e0282
parent5a5f52175223b8a13a323797ac7d9c87492c2955 (diff)
downloadurpmi-df40b76b3cc3d1d743bda28406e8bec3c4873ebd.tar
urpmi-df40b76b3cc3d1d743bda28406e8bec3c4873ebd.tar.gz
urpmi-df40b76b3cc3d1d743bda28406e8bec3c4873ebd.tar.bz2
urpmi-df40b76b3cc3d1d743bda28406e8bec3c4873ebd.tar.xz
urpmi-df40b76b3cc3d1d743bda28406e8bec3c4873ebd.zip
(unselected_packages) kill unused parameter
-rwxr-xr-xgurpmi22
-rw-r--r--urpm/select.pm4
-rwxr-xr-xurpmi2
3 files changed, 4 insertions, 4 deletions
diff --git a/gurpmi2 b/gurpmi2
index 8ec618ce..0f63fa03 100755
--- a/gurpmi2
+++ b/gurpmi2
@@ -106,7 +106,7 @@ my $restart_itself = urpm::select::resolve_dependencies($urpm,
auto_select => $::auto_select,
priority_upgrade => $urpm->{options}{'priority-upgrade'},
);
-my @ask_unselect = urpm::select::unselected_packages($urpm, $state);
+my @ask_unselect = urpm::select::unselected_packages($state);
# If there are some unselected packages, designate that we are going to return nonzero code.
if (@ask_unselect) {
diff --git a/urpm/select.pm b/urpm/select.pm
index 96d5801a..67fe6546 100644
--- a/urpm/select.pm
+++ b/urpm/select.pm
@@ -572,14 +572,14 @@ sub _prohibit_packages_that_would_be_removed {
}
-=item unselected_packages(undef, $state)
+=item unselected_packages($state)
misc functions to help finding ask_unselect and ask_remove elements with their reasons translated.
=cut
sub unselected_packages {
- my (undef, $state) = @_;
+ my ($state) = @_;
grep { $state->{rejected}{$_}{backtrack} } keys %{$state->{rejected} || {}};
}
diff --git a/urpmi b/urpmi
index cdcd62c4..46516787 100755
--- a/urpmi
+++ b/urpmi
@@ -502,7 +502,7 @@ that are older than the installed ones:\n%s", $list);
$urpm::postponed_code = 17;
}
-my @ask_unselect = urpm::select::unselected_packages($urpm, $state);
+my @ask_unselect = urpm::select::unselected_packages($state);
if (@ask_unselect) {
my $list = urpm::select::translate_why_unselected($urpm, $state, @ask_unselect);
my $msg = @ask_unselect == 1 ?