diff options
author | Thierry Vignaud <thierry.vignaud@gmail.com> | 2014-05-14 06:19:49 +0200 |
---|---|---|
committer | Thierry Vignaud <thierry.vignaud@gmail.com> | 2014-05-14 06:19:49 +0200 |
commit | d9edf243aeba4a33fe2d9dc68dcb4d2bdf2d5730 (patch) | |
tree | 3b45bd0b92303aa5f51638c6c5951b664274d34e /URPM | |
parent | a901c2938331de7108a9edc434078d1b5d7e30a4 (diff) | |
download | perl-URPM-d9edf243aeba4a33fe2d9dc68dcb4d2bdf2d5730.tar perl-URPM-d9edf243aeba4a33fe2d9dc68dcb4d2bdf2d5730.tar.gz perl-URPM-d9edf243aeba4a33fe2d9dc68dcb4d2bdf2d5730.tar.bz2 perl-URPM-d9edf243aeba4a33fe2d9dc68dcb4d2bdf2d5730.tar.xz perl-URPM-d9edf243aeba4a33fe2d9dc68dcb4d2bdf2d5730.zip |
simplify after commit 307fdff9e12f783b01d0275d92c22b4cf7dd020f
its return value is now always ()
rationale: resolve_rejected() was wrong, since it blindly removes
installed pkgs w/o trying to promote anything and @diff_provides can be
nicely used to handle rejecting package one by one, then
_handle_diff_provides() should do the right job.
(spot by perl_checker)
Diffstat (limited to 'URPM')
-rw-r--r-- | URPM/Resolve.pm | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/URPM/Resolve.pm b/URPM/Resolve.pm index 95b55ec..690d7c5 100644 --- a/URPM/Resolve.pm +++ b/URPM/Resolve.pm @@ -814,7 +814,6 @@ sub backtrack_selected { } } - my @properties; if (defined $dep->{psel}) { if ($options{keep}) { backtrack_selected_psel_keep($urpm, $db, $state, $dep->{psel}, $dep->{keep}); @@ -843,7 +842,6 @@ sub backtrack_selected { #- some packages may have been removed because of selection of this one. #- the rejected flags should have been cleaned by disable_selected above. - @properties; } #- side-effects: @@ -1309,7 +1307,7 @@ sub _handle_conflicts_with_selected { $urpm->{debug_URPM}($pkg->fullname . " conflicts with already selected package " . $p->fullname) if $urpm->{debug_URPM}; _remove_all_rejected_from($state, $pkg); _set_rejected_from($state, $pkg, $p); - unshift @$properties, backtrack_selected($urpm, $db, $state, $dep, $diff_provides, %options); + backtrack_selected($urpm, $db, $state, $dep, $diff_provides, %options); return; } _set_rejected_from($state, $p, $pkg); |