summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <thierry.vignaud@gmail.com>2014-09-07 03:40:14 +0200
committerPascal Terjan <pterjan@gmail.com>2014-10-20 21:29:56 +0000
commit7df6ec8f9e5d3ad76f5584e775f37b99125be671 (patch)
treeb06a198f3bf3857e48ed0a57041db91c793f471a
parent36c261c39286e18594a30df226db953419a5689b (diff)
downloaddrakx-7df6ec8f9e5d3ad76f5584e775f37b99125be671.tar
drakx-7df6ec8f9e5d3ad76f5584e775f37b99125be671.tar.gz
drakx-7df6ec8f9e5d3ad76f5584e775f37b99125be671.tar.bz2
drakx-7df6ec8f9e5d3ad76f5584e775f37b99125be671.tar.xz
drakx-7df6ec8f9e5d3ad76f5584e775f37b99125be671.zip
s/suggested/recommended/
-rw-r--r--perl-install/install/pkgs.pm14
1 files changed, 7 insertions, 7 deletions
diff --git a/perl-install/install/pkgs.pm b/perl-install/install/pkgs.pm
index 3b39adcbf..a2afddbf5 100644
--- a/perl-install/install/pkgs.pm
+++ b/perl-install/install/pkgs.pm
@@ -287,17 +287,17 @@ sub select_by_package_names_or_die {
}
}
-my @suggested_package_ids;
+my @recommended_package_ids;
sub _resolve_requested_and_check {
my ($packages, $state, $requested) = @_;
my @l = $packages->resolve_requested($packages->{rpmdb}, $state, $requested,
callback_choices => \&packageCallbackChoices, no_suggests => $::o->{no_suggests});
- #- keep track of suggested packages so that theys could be unselected if the "no suggests" option is choosen later:
+ #- keep track of recommended packages so that theys could be unselected if the "no suggests" option is choosen later:
if (!is_empty_hash_ref($state->{selected})) {
- my @new_ids = map { $packages->{depslist}[$_]->id } grep { $state->{selected}{$_}{suggested} } keys $state->{selected};
- @suggested_package_ids = uniq(@suggested_package_ids, @new_ids);
+ my @new_ids = map { $packages->{depslist}[$_]->id } grep { $state->{selected}{$_}{recommended} } keys $state->{selected};
+ @recommended_package_ids = uniq(@recommended_package_ids, @new_ids);
}
my $error;
@@ -351,9 +351,9 @@ sub unselectAllPackages {
log::l("unselecting all packages...");
foreach (@{$packages->{depslist}}) {
my $to_select = $_->flag_base || $_->flag_installed && $_->flag_selected;
- # unselect suggested packages if minimal install:
- if ($::o->{no_suggests} && member($_->id, @suggested_package_ids)) {
- log::l("unselecting suggested package " . $_->name);
+ # unselect recommended packages if minimal install:
+ if ($::o->{no_suggests} && member($_->id, @recommended_package_ids)) {
+ log::l("unselecting recommended package " . $_->name);
undef $to_select;
}
if ($to_select) {