aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--URPM/Resolve.pm24
1 files changed, 12 insertions, 12 deletions
diff --git a/URPM/Resolve.pm b/URPM/Resolve.pm
index 0a8e3ed..5be4f32 100644
--- a/URPM/Resolve.pm
+++ b/URPM/Resolve.pm
@@ -678,9 +678,9 @@ sub unsatisfied_requires {
=item with_db_unsatisfied_requires($urpm, $db, $state, $name, $do)
-This function is "suggests vs requires" safe:
-Traversing DB on 'whatrequires' will give both requires & suggests, but ->unsatisfied_requires()
-will check $p->requires and so filter out suggests
+This function is "recommends vs requires" safe:
+Traversing DB on 'whatrequires' will give both requires & recommends, but ->unsatisfied_requires()
+will check $p->requires and so filter out recommends
=cut
@@ -1084,7 +1084,7 @@ The following options are recognized :
=item nodeps :
-=item no_suggests: ignore suggests tags
+=item no_suggests: ignore recommends tags
=back
@@ -1114,27 +1114,27 @@ sub resolve_requested_suggests {
my @todo = @$selected;
while (@todo) {
my $pkg = shift @todo;
- my %suggests = map { $_ => 1 } $pkg->recommends_nosense or next;
+ my %recommends = map { $_ => 1 } $pkg->recommends_nosense or next;
#- do not install a package that has already been suggested
$db->traverse_tag_find('name', $pkg->name, sub {
my ($p) = @_;
- delete $suggests{$_} foreach $p->recommends_nosense;
+ delete $recommends{$_} foreach $p->recommends_nosense;
});
# workaround: if you do "urpmi virtual_pkg" and one virtual_pkg is already installed,
# it will ask anyway for the other choices
- foreach my $suggest (keys %suggests) {
+ foreach my $suggest (keys %recommends) {
$db->traverse_tag_find('whatprovides', $suggest, sub {
- delete $suggests{$suggest};
+ delete $recommends{$suggest};
});
}
- %suggests or next;
+ %recommends or next;
- $urpm->{debug_URPM}("requested " . join(', ', keys %suggests) . " suggested by " . $pkg->fullname) if $urpm->{debug_URPM};
+ $urpm->{debug_URPM}("requested " . join(', ', keys %recommends) . " suggested by " . $pkg->fullname) if $urpm->{debug_URPM};
- my %new_requested = map { $_ => undef } keys %suggests;
+ my %new_requested = map { $_ => undef } keys %recommends;
my @new_selected = resolve_requested__no_suggests_($urpm, $db, $state, \%new_requested, %options);
$state->{selected}{$_->id}{suggested} = 1 foreach @new_selected;
push @$selected, @new_selected;
@@ -1146,7 +1146,7 @@ sub resolve_requested_suggests {
=item resolve_requested__no_suggests($urpm, $db, $state, $requested, %options)
-Like resolve_requested() but doesn't handle suggests
+Like resolve_requested() but doesn't handle recommends
=cut