diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2007-05-03 14:49:11 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2007-05-03 14:49:11 +0000 |
| commit | 9e5e408586d3bbc9989b539c9b0f7fbb17162f73 (patch) | |
| tree | f9ac341132f195484c1dfd79077c6ea7aa8e96a9 | |
| parent | 2ba2cf3c2a347757cbc4cbef7bf7019cd2b65c9f (diff) | |
| download | perl-URPM-9e5e408586d3bbc9989b539c9b0f7fbb17162f73.tar perl-URPM-9e5e408586d3bbc9989b539c9b0f7fbb17162f73.tar.gz perl-URPM-9e5e408586d3bbc9989b539c9b0f7fbb17162f73.tar.bz2 perl-URPM-9e5e408586d3bbc9989b539c9b0f7fbb17162f73.tar.xz perl-URPM-9e5e408586d3bbc9989b539c9b0f7fbb17162f73.zip | |
- pass the virtual package name as a parameter to {callback_choices} in
->resolve_requested
| -rw-r--r-- | NEWS | 3 | ||||
| -rw-r--r-- | URPM/Resolve.pm | 2 |
2 files changed, 4 insertions, 1 deletions
@@ -1,3 +1,6 @@ +- pass the virtual package name as a parameter to {callback_choices} in + ->resolve_requested + Version 1.61 - 3 April 2007, by Pascal "Pixel" Rigaux - add $trans->NElements and $trans->Element_name diff --git a/URPM/Resolve.pm b/URPM/Resolve.pm index 7aeb0d1..3b6ede7 100644 --- a/URPM/Resolve.pm +++ b/URPM/Resolve.pm @@ -505,7 +505,7 @@ sub resolve_requested { unshift @properties, $urpm->backtrack_selected($db, $state, $dep, %options); next; #- backtrack code choose to continue with same package or completely new strategy. } elsif ($options{callback_choices} && @chosen > 1) { - my @l = grep { ref $_ } $options{callback_choices}->($urpm, $db, $state, \@chosen); + my @l = grep { ref $_ } $options{callback_choices}->($urpm, $db, $state, \@chosen, _id_to_name($urpm, $dep->{required})); $urpm->{debug_URPM}("replacing " . _id_to_name($urpm, $dep->{required}) . " with " . join(' ', map { $_->name } @l)) if $urpm->{debug_URPM}; unshift @properties, map { |