aboutsummaryrefslogtreecommitdiffstats
path: root/URPM/Resolve.pm
diff options
context:
space:
mode:
Diffstat (limited to 'URPM/Resolve.pm')
-rw-r--r--URPM/Resolve.pm28
1 files changed, 14 insertions, 14 deletions
diff --git a/URPM/Resolve.pm b/URPM/Resolve.pm
index 5be4f32..2b5bcc7 100644
--- a/URPM/Resolve.pm
+++ b/URPM/Resolve.pm
@@ -1088,28 +1088,28 @@ The following options are recognized :
=back
-It actually calls resolve_requested__no_suggests() and resolve_requested_suggests().
+It actually calls resolve_requested__no_recommends() and resolve_requested_recommends().
=cut
sub resolve_requested {
my ($urpm, $db, $state, $requested, %options) = @_;
- my @selected = resolve_requested__no_suggests($urpm, $db, $state, $requested, %options);
+ my @selected = resolve_requested__no_recommends($urpm, $db, $state, $requested, %options);
if (!$options{no_suggests}) {
- @selected = resolve_requested_suggests($urpm, $db, $state, \@selected, %options);
+ @selected = resolve_requested_recommends($urpm, $db, $state, \@selected, %options);
}
@selected;
}
-=item resolve_requested_suggests($urpm, $db, $state, $selected, %options)
+=item resolve_requested_recommends($urpm, $db, $state, $selected, %options)
Select newly suggested package is installed as if (hard) required.
=cut
-sub resolve_requested_suggests {
+sub resolve_requested_recommends {
my ($urpm, $db, $state, $selected, %options) = @_;
my @todo = @$selected;
while (@todo) {
@@ -1135,7 +1135,7 @@ sub resolve_requested_suggests {
$urpm->{debug_URPM}("requested " . join(', ', keys %recommends) . " suggested by " . $pkg->fullname) if $urpm->{debug_URPM};
my %new_requested = map { $_ => undef } keys %recommends;
- my @new_selected = resolve_requested__no_suggests_($urpm, $db, $state, \%new_requested, %options);
+ my @new_selected = resolve_requested__no_recommends_($urpm, $db, $state, \%new_requested, %options);
$state->{selected}{$_->id}{suggested} = 1 foreach @new_selected;
push @$selected, @new_selected;
push @todo, @new_selected;
@@ -1144,16 +1144,16 @@ sub resolve_requested_suggests {
@$selected;
}
-=item resolve_requested__no_suggests($urpm, $db, $state, $requested, %options)
+=item resolve_requested__no_recommends($urpm, $db, $state, $requested, %options)
Like resolve_requested() but doesn't handle recommends
=cut
-# see resolve_requested above for information about usage (modulo 'no_suggests' option)
+# see resolve_requested above for information about usage (modulo 'no_recommends' option)
#- side-effects: flag_requested
-#- + those of resolve_requested__no_suggests_
-sub resolve_requested__no_suggests {
+#- + those of resolve_requested__no_recommends_
+sub resolve_requested__no_recommends {
my ($urpm, $db, $state, $requested, %options) = @_;
foreach (keys %$requested) {
@@ -1163,10 +1163,10 @@ sub resolve_requested__no_suggests {
}
}
- resolve_requested__no_suggests_($urpm, $db, $state, $requested, %options);
+ resolve_requested__no_recommends_($urpm, $db, $state, $requested, %options);
}
-# same as resolve_requested__no_suggests, but do not modify requested_flag
+# same as resolve_requested__no_recommends, but do not modify requested_flag
#-
#- side-effects: $state->{selected}, flag_required, flag_installed, flag_upgrade
#- + those of backtrack_selected (flag_requested, $state->{rejected}, $state->{whatrequires}, $state->{backtrack})
@@ -1176,7 +1176,7 @@ sub resolve_requested__no_suggests {
#- + those of backtrack_selected_psel_keep (flag_requested, $state->{whatrequires})
#- + those of _handle_diff_provides (flag_requested, $state->{rejected}, $state->{whatrequires})
#- + those of _no_more_recent_installed_and_providing ($state->{rejected})
-sub resolve_requested__no_suggests_ {
+sub resolve_requested__no_recommends_ {
my ($urpm, $db, $state, $requested, %options) = @_;
my @properties = map {
@@ -2296,7 +2296,7 @@ sub build_transaction_set {
}
my %requested = map { $_ => undef } @ids;
- resolve_requested__no_suggests_($urpm,
+ resolve_requested__no_recommends_($urpm,
$db, $state->{transaction_state} ||= {},
\%requested,
defined $options{start} ? (start => $options{start}) : @{[]},