From 9e5e408586d3bbc9989b539c9b0f7fbb17162f73 Mon Sep 17 00:00:00 2001 From: Pascal Rigaux Date: Thu, 3 May 2007 14:49:11 +0000 Subject: - pass the virtual package name as a parameter to {callback_choices} in ->resolve_requested --- NEWS | 3 +++ URPM/Resolve.pm | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/NEWS b/NEWS index 0f48de6..4591b1b 100644 --- a/NEWS +++ b/NEWS @@ -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 { -- cgit v1.2.1