diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2007-09-11 15:35:27 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2007-09-11 15:35:27 +0000 |
| commit | 819cda3c2d62f90fd7257f6a3035817a7e1a0b78 (patch) | |
| tree | fe802c4677b123fa9791542c22d75a6af899cf7f | |
| parent | 0a1ac1e08898d7766fb9e7bd4d3a0029a7c60dd1 (diff) | |
| download | perl-URPM-819cda3c2d62f90fd7257f6a3035817a7e1a0b78.tar perl-URPM-819cda3c2d62f90fd7257f6a3035817a7e1a0b78.tar.gz perl-URPM-819cda3c2d62f90fd7257f6a3035817a7e1a0b78.tar.bz2 perl-URPM-819cda3c2d62f90fd7257f6a3035817a7e1a0b78.tar.xz perl-URPM-819cda3c2d62f90fd7257f6a3035817a7e1a0b78.zip | |
rename disable_selected_unrequested_dependencies() into disable_selected_and_unrequested_dependencies()
| -rw-r--r-- | URPM/Resolve.pm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/URPM/Resolve.pm b/URPM/Resolve.pm index 22d37d3..adff491 100644 --- a/URPM/Resolve.pm +++ b/URPM/Resolve.pm @@ -363,7 +363,7 @@ sub backtrack_selected { my @l = map { $urpm->search($_, strict_fullname => 1) } keys %{($state->{rejected}{$_->fullname} || {})->{closure}}; - disable_selected_unrequested_dependencies($urpm, $db, $state, @l); + disable_selected_and_unrequested_dependencies($urpm, $db, $state, @l); return { required => $_->id, exists $dep->{from} ? (from => $dep->{from}) : @{[]}, @@ -384,7 +384,7 @@ sub backtrack_selected { #- all selection tree, re-enabling removed and obsoleted packages as well. unless (exists $state->{rejected}{$dep->{from}->fullname}) { #- package is not currently rejected, compute the closure now. - my @l = disable_selected_unrequested_dependencies($urpm, $db, $state, $dep->{from}); + my @l = disable_selected_and_unrequested_dependencies($urpm, $db, $state, $dep->{from}); foreach (@l) { #- disable all these packages in order to avoid selecting them again. $_->fullname eq $dep->{from}->fullname or @@ -429,7 +429,7 @@ sub backtrack_selected_psel_keep { #- we shouldn't try to remove packages, so psel which leads to this need to be unselected. unless (exists $state->{rejected}{$psel->fullname}) { #- package is not currently rejected, compute the closure now. - my @l = disable_selected_unrequested_dependencies($urpm, $db, $state, $psel); + my @l = disable_selected_and_unrequested_dependencies($urpm, $db, $state, $psel); foreach (@l) { #- disable all these packages in order to avoid selecting them again. $_->fullname eq $psel->fullname or @@ -1047,7 +1047,7 @@ sub disable_selected { } #- determine dependencies that can safely been removed and are not requested -sub disable_selected_unrequested_dependencies { +sub disable_selected_and_unrequested_dependencies { my ($urpm, $db, $state, @pkgs_todo) = @_; my @all_unselected; |