diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2007-09-12 10:14:45 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2007-09-12 10:14:45 +0000 |
| commit | cef366646c22d1e230c687bb34ca4b0195f385cb (patch) | |
| tree | 8e50ee24d4e58412034962444c9d4faaee5dac49 | |
| parent | 8c5ec672d46984d4470d0ba74c0d20289682b590 (diff) | |
| download | perl-URPM-cef366646c22d1e230c687bb34ca4b0195f385cb.tar perl-URPM-cef366646c22d1e230c687bb34ca4b0195f385cb.tar.gz perl-URPM-cef366646c22d1e230c687bb34ca4b0195f385cb.tar.bz2 perl-URPM-cef366646c22d1e230c687bb34ca4b0195f385cb.tar.xz perl-URPM-cef366646c22d1e230c687bb34ca4b0195f385cb.zip | |
backtrack_selected() was always returning empty list, so
backtrack_selected_psel_keep() should return empty list. but it's simply to
modify callers to take into account the return value is ()
| -rw-r--r-- | URPM/Resolve.pm | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/URPM/Resolve.pm b/URPM/Resolve.pm index 54a21ce..4749090 100644 --- a/URPM/Resolve.pm +++ b/URPM/Resolve.pm @@ -731,7 +731,7 @@ sub resolve_requested__no_suggests_ { #- keep existing package and therefore cancel current one. if (@keep) { - unshift @properties, backtrack_selected_psel_keep($urpm, $db, $state, $pkg, \@keep); + backtrack_selected_psel_keep($urpm, $db, $state, $pkg, \@keep); } } if (my $diff = shift @diff_provides) { @@ -934,8 +934,7 @@ sub _handle_diff_provides { push @$properties, map { +{ required => $_, promote => $n, psel => $pkg } } @best; } else { if ($options{keep}) { - unshift @$properties, - backtrack_selected_psel_keep($urpm, $db, $state, $pkg, [ scalar $p->fullname ]); + backtrack_selected_psel_keep($urpm, $db, $state, $pkg, [ scalar $p->fullname ]); } else { resolve_rejected_($urpm, $db, $state, $p, $properties, removed => 1, |